From 64bde2017b4aa5187712ad8cad07bbb6d4f3887e Mon Sep 17 00:00:00 2001 From: Sam Chau Date: Mon, 3 Nov 2025 17:32:45 +1030 Subject: [PATCH] chore(logs): Cleanup double logger alias --- src/lib/server/db/db.ts | 2 +- src/lib/server/db/migrations.ts | 2 +- src/lib/server/jobs/definitions/cleanupBackups.ts | 2 +- src/lib/server/jobs/definitions/cleanupLogs.ts | 2 +- src/lib/server/jobs/definitions/createBackup.ts | 2 +- src/lib/server/jobs/init.ts | 2 +- src/lib/server/jobs/runner.ts | 2 +- src/lib/server/jobs/scheduler.ts | 2 +- src/lib/server/notifications/NotificationManager.ts | 2 +- src/lib/server/notifications/base/BaseHttpNotifier.ts | 2 +- src/lib/server/utils/arr/base.ts | 2 +- src/routes/arr/[type]/[id]/edit/+page.server.ts | 2 +- src/routes/arr/new/+page.server.ts | 2 +- src/routes/settings/backups/+page.server.ts | 2 +- src/routes/settings/general/+page.server.ts | 2 +- src/routes/settings/jobs/+page.server.ts | 2 +- src/routes/settings/jobs/[id]/edit/+page.server.ts | 2 +- src/routes/settings/notifications/+page.server.ts | 2 +- src/routes/settings/notifications/edit/[id]/+page.server.ts | 2 +- src/routes/settings/notifications/new/+page.server.ts | 2 +- svelte.config.js | 3 +-- 21 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/lib/server/db/db.ts b/src/lib/server/db/db.ts index c63a30f..5503291 100644 --- a/src/lib/server/db/db.ts +++ b/src/lib/server/db/db.ts @@ -1,7 +1,7 @@ import { Database } from '@jsr/db__sqlite'; import type { RestBindParameters } from '@jsr/db__sqlite'; import { config } from '$config'; -import { logger } from '$logger'; +import { logger } from '$logger/logger.ts'; /** * Database singleton for SQLite diff --git a/src/lib/server/db/migrations.ts b/src/lib/server/db/migrations.ts index 56a4fe0..1b6b60c 100644 --- a/src/lib/server/db/migrations.ts +++ b/src/lib/server/db/migrations.ts @@ -1,5 +1,5 @@ import { db } from './db.ts'; -import { logger } from '$logger'; +import { logger } from '$logger/logger.ts'; // Static imports for all migrations import { migration as migration001 } from './migrations/001_create_arr_instances.ts'; diff --git a/src/lib/server/jobs/definitions/cleanupBackups.ts b/src/lib/server/jobs/definitions/cleanupBackups.ts index 89a4460..a203cca 100644 --- a/src/lib/server/jobs/definitions/cleanupBackups.ts +++ b/src/lib/server/jobs/definitions/cleanupBackups.ts @@ -1,6 +1,6 @@ import { config } from '$config'; import { backupSettingsQueries } from '$db/queries/backupSettings.ts'; -import { logger } from '$logger'; +import { logger } from '$logger/logger.ts'; import type { JobDefinition, JobResult } from '../types.ts'; /** diff --git a/src/lib/server/jobs/definitions/cleanupLogs.ts b/src/lib/server/jobs/definitions/cleanupLogs.ts index cde8f6d..08ddf81 100644 --- a/src/lib/server/jobs/definitions/cleanupLogs.ts +++ b/src/lib/server/jobs/definitions/cleanupLogs.ts @@ -1,6 +1,6 @@ import { config } from '$config'; import { logSettingsQueries } from '$db/queries/logSettings.ts'; -import { logger } from '$logger'; +import { logger } from '$logger/logger.ts'; import { cleanupLogs } from '../logic/cleanupLogs.ts'; import type { JobDefinition, JobResult } from '../types.ts'; diff --git a/src/lib/server/jobs/definitions/createBackup.ts b/src/lib/server/jobs/definitions/createBackup.ts index 00a4c36..fbcbee0 100644 --- a/src/lib/server/jobs/definitions/createBackup.ts +++ b/src/lib/server/jobs/definitions/createBackup.ts @@ -1,6 +1,6 @@ import { config } from '$config'; import { backupSettingsQueries } from '$db/queries/backupSettings.ts'; -import { logger } from '$logger'; +import { logger } from '$logger/logger.ts'; import { createBackup } from '../logic/createBackup.ts'; import type { JobDefinition, JobResult } from '../types.ts'; diff --git a/src/lib/server/jobs/init.ts b/src/lib/server/jobs/init.ts index d6dab63..684504f 100644 --- a/src/lib/server/jobs/init.ts +++ b/src/lib/server/jobs/init.ts @@ -1,6 +1,6 @@ import { jobRegistry } from './registry.ts'; import { jobsQueries } from '$db/queries/jobs.ts'; -import { logger } from '$logger'; +import { logger } from '$logger/logger.ts'; // Import all job definitions import { cleanupLogsJob } from './definitions/cleanupLogs.ts'; diff --git a/src/lib/server/jobs/runner.ts b/src/lib/server/jobs/runner.ts index 8a817f1..5a7a160 100644 --- a/src/lib/server/jobs/runner.ts +++ b/src/lib/server/jobs/runner.ts @@ -1,6 +1,6 @@ import { jobRegistry } from './registry.ts'; import { jobsQueries, jobRunsQueries } from '$db/queries/jobs.ts'; -import { logger } from '$logger'; +import { logger } from '$logger/logger.ts'; import { notificationManager } from '../notifications/NotificationManager.ts'; import type { Job, JobResult } from './types.ts'; diff --git a/src/lib/server/jobs/scheduler.ts b/src/lib/server/jobs/scheduler.ts index b9763f0..09a5c79 100644 --- a/src/lib/server/jobs/scheduler.ts +++ b/src/lib/server/jobs/scheduler.ts @@ -1,6 +1,6 @@ import { jobsQueries } from '$db/queries/jobs.ts'; import { runJob } from './runner.ts'; -import { logger } from '$logger'; +import { logger } from '$logger/logger.ts'; /** * Job scheduler - checks for due jobs and executes them diff --git a/src/lib/server/notifications/NotificationManager.ts b/src/lib/server/notifications/NotificationManager.ts index 7294cdb..d92b3d0 100644 --- a/src/lib/server/notifications/NotificationManager.ts +++ b/src/lib/server/notifications/NotificationManager.ts @@ -1,4 +1,4 @@ -import { logger } from '$logger'; +import { logger } from '$logger/logger.ts'; import { notificationServicesQueries } from '$db/queries/notificationServices.ts'; import { notificationHistoryQueries } from '$db/queries/notificationHistory.ts'; import type { Notifier } from './base/Notifier.ts'; diff --git a/src/lib/server/notifications/base/BaseHttpNotifier.ts b/src/lib/server/notifications/base/BaseHttpNotifier.ts index c854296..04ce11a 100644 --- a/src/lib/server/notifications/base/BaseHttpNotifier.ts +++ b/src/lib/server/notifications/base/BaseHttpNotifier.ts @@ -1,4 +1,4 @@ -import { logger } from '$logger'; +import { logger } from '$logger/logger.ts'; import type { Notification } from '../types.ts'; import type { Notifier } from './Notifier.ts'; diff --git a/src/lib/server/utils/arr/base.ts b/src/lib/server/utils/arr/base.ts index 09fa7f5..10aaa31 100644 --- a/src/lib/server/utils/arr/base.ts +++ b/src/lib/server/utils/arr/base.ts @@ -1,6 +1,6 @@ import { BaseHttpClient } from '../http/client.ts'; import type { ArrSystemStatus } from './types.ts'; -import { logger } from '$logger'; +import { logger } from '$logger/logger.ts'; /** * Base client for all *arr applications diff --git a/src/routes/arr/[type]/[id]/edit/+page.server.ts b/src/routes/arr/[type]/[id]/edit/+page.server.ts index 5b7380b..d6945d6 100644 --- a/src/routes/arr/[type]/[id]/edit/+page.server.ts +++ b/src/routes/arr/[type]/[id]/edit/+page.server.ts @@ -1,7 +1,7 @@ import { error, redirect, fail } from '@sveltejs/kit'; import type { ServerLoad, Actions } from '@sveltejs/kit'; import { arrInstancesQueries } from '$db/queries/arrInstances.ts'; -import { logger } from '$logger'; +import { logger } from '$logger/logger.ts'; // Valid arr types const VALID_TYPES = ['radarr', 'sonarr', 'lidarr', 'chaptarr']; diff --git a/src/routes/arr/new/+page.server.ts b/src/routes/arr/new/+page.server.ts index 3319f2f..c850ca9 100644 --- a/src/routes/arr/new/+page.server.ts +++ b/src/routes/arr/new/+page.server.ts @@ -1,7 +1,7 @@ import { fail, redirect } from '@sveltejs/kit'; import type { Actions } from '@sveltejs/kit'; import { arrInstancesQueries } from '$db/queries/arrInstances.ts'; -import { logger } from '$logger'; +import { logger } from '$logger/logger.ts'; const VALID_TYPES = ['radarr', 'sonarr', 'lidarr', 'chaptarr']; diff --git a/src/routes/settings/backups/+page.server.ts b/src/routes/settings/backups/+page.server.ts index 3be6fc3..5909718 100644 --- a/src/routes/settings/backups/+page.server.ts +++ b/src/routes/settings/backups/+page.server.ts @@ -1,7 +1,7 @@ import type { Actions, RequestEvent } from '@sveltejs/kit'; import { fail } from '@sveltejs/kit'; import { config } from '$config'; -import { logger } from '$logger'; +import { logger } from '$logger/logger.ts'; import { jobScheduler } from '$jobs/scheduler.ts'; interface BackupFile { diff --git a/src/routes/settings/general/+page.server.ts b/src/routes/settings/general/+page.server.ts index 194c9b6..b405591 100644 --- a/src/routes/settings/general/+page.server.ts +++ b/src/routes/settings/general/+page.server.ts @@ -3,7 +3,7 @@ import { fail } from '@sveltejs/kit'; import { logSettingsQueries } from '$db/queries/logSettings.ts'; import { backupSettingsQueries } from '$db/queries/backupSettings.ts'; import { logSettings } from '$logger/settings.ts'; -import { logger } from '$logger'; +import { logger } from '$logger/logger.ts'; export const load = () => { const logSetting = logSettingsQueries.get(); diff --git a/src/routes/settings/jobs/+page.server.ts b/src/routes/settings/jobs/+page.server.ts index 6c989d4..8010124 100644 --- a/src/routes/settings/jobs/+page.server.ts +++ b/src/routes/settings/jobs/+page.server.ts @@ -2,7 +2,7 @@ import type { Actions, RequestEvent } from '@sveltejs/kit'; import { fail } from '@sveltejs/kit'; import { jobsQueries, jobRunsQueries } from '$db/queries/jobs.ts'; import { jobScheduler } from '$jobs/scheduler.ts'; -import { logger } from '$logger'; +import { logger } from '$logger/logger.ts'; // Helper to format schedule for display function formatSchedule(schedule: string): string { diff --git a/src/routes/settings/jobs/[id]/edit/+page.server.ts b/src/routes/settings/jobs/[id]/edit/+page.server.ts index de19bc9..692f8bc 100644 --- a/src/routes/settings/jobs/[id]/edit/+page.server.ts +++ b/src/routes/settings/jobs/[id]/edit/+page.server.ts @@ -1,7 +1,7 @@ import type { Actions, RequestEvent } from '@sveltejs/kit'; import { fail, redirect } from '@sveltejs/kit'; import { jobsQueries } from '$db/queries/jobs.ts'; -import { logger } from '$logger'; +import { logger } from '$logger/logger.ts'; export const load = ({ params }: { params: Record }) => { const jobId = parseInt(params.id || ''); diff --git a/src/routes/settings/notifications/+page.server.ts b/src/routes/settings/notifications/+page.server.ts index 07957d4..60cf578 100644 --- a/src/routes/settings/notifications/+page.server.ts +++ b/src/routes/settings/notifications/+page.server.ts @@ -1,6 +1,6 @@ import type { Actions, RequestEvent } from '@sveltejs/kit'; import { fail } from '@sveltejs/kit'; -import { logger } from '$logger'; +import { logger } from '$logger/logger.ts'; import { notificationServicesQueries } from '$db/queries/notificationServices.ts'; import { notificationHistoryQueries } from '$db/queries/notificationHistory.ts'; import type { NotificationService } from '$db/queries/notificationServices.ts'; diff --git a/src/routes/settings/notifications/edit/[id]/+page.server.ts b/src/routes/settings/notifications/edit/[id]/+page.server.ts index fa9fb49..568dcc1 100644 --- a/src/routes/settings/notifications/edit/[id]/+page.server.ts +++ b/src/routes/settings/notifications/edit/[id]/+page.server.ts @@ -1,6 +1,6 @@ import type { Actions, RequestEvent } from '@sveltejs/kit'; import { error, fail, redirect } from '@sveltejs/kit'; -import { logger } from '$logger'; +import { logger } from '$logger/logger.ts'; import { notificationServicesQueries } from '$db/queries/notificationServices.ts'; export const load = ({ params }: { params: { id: string } }) => { diff --git a/src/routes/settings/notifications/new/+page.server.ts b/src/routes/settings/notifications/new/+page.server.ts index 7752f61..3488ca6 100644 --- a/src/routes/settings/notifications/new/+page.server.ts +++ b/src/routes/settings/notifications/new/+page.server.ts @@ -1,6 +1,6 @@ import type { Actions, RequestEvent } from '@sveltejs/kit'; import { fail, redirect } from '@sveltejs/kit'; -import { logger } from '$logger'; +import { logger } from '$logger/logger.ts'; import { notificationServicesQueries } from '$db/queries/notificationServices.ts'; export const actions: Actions = { diff --git a/svelte.config.js b/svelte.config.js index 0fc74ad..400a81d 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -11,8 +11,7 @@ const config = { }), alias: { $config: './src/lib/server/utils/config/config.ts', - $logger: './src/lib/server/utils/logger/logger.ts', - '$logger/*': './src/lib/server/utils/logger/*', + $logger: './src/lib/server/utils/logger', $shared: './src/lib/shared', $stores: './src/lib/client/stores', $ui: './src/lib/client/ui',