Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(dashboard,cli,serverless): various small bugs #907

Merged
merged 1 commit into from
May 28, 2023
Merged

fix(dashboard,cli,serverless): various small bugs #907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/hungry-geckos-tap.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@lagon/dashboard': patch
---

Fix domain status when proxied through Cloudflare
5 changes: 5 additions & 0 deletions .changeset/lemon-ducks-learn.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@lagon/cli': patch
---

Reduce loading animation ticks
5 changes: 5 additions & 0 deletions .changeset/neat-otters-live.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@lagon/serverless': patch
---

Fix logs time-to-live
2 changes: 1 addition & 1 deletion crates/cli/src/utils/console.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ pub fn print_progress(message: &str) -> impl Fn() + '_ {
}

handle.tick();
tokio::time::sleep(Duration::from_millis(10)).await;
tokio::time::sleep(Duration::from_millis(50)).await;
}
});

Expand Down
2 changes: 1 addition & 1 deletion crates/serverless/src/clickhouse.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ pub async fn run_migrations(client: &Client) -> Result<()> {
)
ENGINE = MergeTree()
PRIMARY KEY (level, function_id, timestamp)
TTL now() + INTERVAL 1 WEEK",
TTL timestamp + INTERVAL 1 WEEK",
)
.execute()
.await?;
Expand Down
9 changes: 7 additions & 2 deletions packages/dashboard/lib/pages/function/FunctionSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ const FunctionSettings = ({ func, refetch }: FunctionSettingsProps) => {
);

const promises = func.domains.map(async domain => {
const response = await fetch(`https://cloudflare-dns.com/dns-query?name=${domain}&type=A`, {
const response = await fetch(`https://cloudflare-dns.com/dns-query?name=${domain}&type=CNAME`, {
headers: {
accept: 'application/dns-json',
},
Expand All @@ -97,11 +97,16 @@ const FunctionSettings = ({ func, refetch }: FunctionSettingsProps) => {

let domainStatus: DomainStatus;

if (result.Answer?.[0]?.name === domain && result.Answer?.[0]?.data === `${defaultDomain}.`) {
if (result.Answer?.[0]?.data === `${defaultDomain}.`) {
domainStatus = {
status: 'success',
help: t('domains.list.valid'),
};
} else if (result.Authority?.[0].data?.includes('dns.cloudflare.com.')) {
domainStatus = {
status: 'info',
help: t('domains.list.valid.cf'),
};
} else {
domainStatus = {
status: 'danger',
Expand Down
1 change: 1 addition & 0 deletions packages/dashboard/locales/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ export default {
'functions.settings.domains.add.success': 'Domain added successfully.',
'functions.settings.domains.list.default': 'Default domain',
'functions.settings.domains.list.valid': 'Domain is valid',
'functions.settings.domains.list.valid.cf': 'Domain proxied through Cloudflare',
'functions.settings.domains.list.invalid': 'Domain is pointing to {domain} instead of {target}',
'functions.settings.domains.list.delete': 'Delete',
'functions.settings.domains.list.delete.success': 'Domain deleted successfully.',
Expand Down
1 change: 1 addition & 0 deletions packages/dashboard/locales/fr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ export default defineLocale({
'functions.settings.domains.add.success': 'Domaine ajouté avec succès.',
'functions.settings.domains.list.default': 'Domaine par défaut',
'functions.settings.domains.list.valid': 'Domaine valide',
'functions.settings.domains.list.valid.cf': 'Domaine proxié par Cloudflare',
'functions.settings.domains.list.invalid': 'Le domaine pointe vers {domain} au lieu de {target}',
'functions.settings.domains.list.delete': 'Supprimer',
'functions.settings.domains.list.delete.success': 'Domaine supprimé avec succès.',
Expand Down