Skip to content

High performance self-hosted photo and video management solution.

chore(server): proper log context formatting (#22173)

Sergey Katsubo78516a97b331
diff --git a/server/src/repositories/media.repository.ts b/server/src/repositories/media.repository.ts
index adbb8c5879..fa36c41798 100644
--- a/server/src/repositories/media.repository.ts
+++ b/server/src/repositories/media.repository.ts
@@ -57,28 +57,28 @@ export class MediaRepository {
const buffer = await exiftool.extractBinaryTagToBuffer('JpgFromRaw2', input);
return { buffer, format: RawExtractedFormat.Jpeg };
} catch (error: any) {
- this.logger.debug('Could not extract JpgFromRaw2 buffer from image, trying JPEG from RAW next', error.message);
+ this.logger.debug(`Could not extract JpgFromRaw2 buffer from image, trying JPEG from RAW next: ${error}`);
}
try {
const buffer = await exiftool.extractBinaryTagToBuffer('JpgFromRaw', input);
return { buffer, format: RawExtractedFormat.Jpeg };
} catch (error: any) {
- this.logger.debug('Could not extract JPEG buffer from image, trying PreviewJXL next', error.message);
+ this.logger.debug(`Could not extract JPEG buffer from image, trying PreviewJXL next: ${error}`);
}
try {
const buffer = await exiftool.extractBinaryTagToBuffer('PreviewJXL', input);
return { buffer, format: RawExtractedFormat.Jxl };
} catch (error: any) {
- this.logger.debug('Could not extract PreviewJXL buffer from image, trying PreviewImage next', error.message);
+ this.logger.debug(`Could not extract PreviewJXL buffer from image, trying PreviewImage next: ${error}`);
}
try {
const buffer = await exiftool.extractBinaryTagToBuffer('PreviewImage', input);
return { buffer, format: RawExtractedFormat.Jpeg };
} catch (error: any) {
- this.logger.debug('Could not extract preview buffer from image', error.message);
+ this.logger.debug(`Could not extract preview buffer from image: ${error}`);
return null;
}
}
diff --git a/server/src/repositories/metadata.repository.ts b/server/src/repositories/metadata.repository.ts
index bf3a96f21f..e2360156e4 100644
--- a/server/src/repositories/metadata.repository.ts
+++ b/server/src/repositories/metadata.repository.ts
@@ -103,7 +103,7 @@ export class MetadataRepository {
readTags(path: string): Promise<ImmichTags> {
return this.exiftool.read(path).catch((error) => {
- this.logger.warn(`Error reading exif data (${path}): ${error}`, error?.stack);
+ this.logger.warn(`Error reading exif data (${path}): ${error}\n${error?.stack}`);
return {};
}) as Promise<ImmichTags>;
}
diff --git a/server/src/services/auth.service.ts b/server/src/services/auth.service.ts
index 69d872e8c9..535df779cd 100644
--- a/server/src/services/auth.service.ts
+++ b/server/src/services/auth.service.ts
@@ -344,7 +344,7 @@ export class AuthService extends BaseService {
await this.jobRepository.queue({ name: JobName.FileDelete, data: { files: [oldPath] } });
}
} catch (error: Error | any) {
- this.logger.warn(`Unable to sync oauth profile picture: ${error}`, error?.stack);
+ this.logger.warn(`Unable to sync oauth profile picture: ${error}\n${error?.stack}`);
}
}
diff --git a/server/src/services/backup.service.ts b/server/src/services/backup.service.ts
index 40dea2044c..3d99b6e522 100644
--- a/server/src/services/backup.service.ts
+++ b/server/src/services/backup.service.ts
@@ -132,12 +132,12 @@ export class BackupService extends BaseService {
gzip.stdout.pipe(fileStream);
pgdump.on('error', (err) => {
- this.logger.error('Backup failed with error', err);
+ this.logger.error(`Backup failed with error: ${err}`);
reject(err);
});
gzip.on('error', (err) => {
- this.logger.error('Gzip failed with error', err);
+ this.logger.error(`Gzip failed with error: ${err}`);
reject(err);
});
@@ -175,10 +175,10 @@ export class BackupService extends BaseService {
});
await this.storageRepository.rename(backupFilePath, backupFilePath.replace('.tmp', ''));
} catch (error) {
- this.logger.error('Database Backup Failure', error);
+ this.logger.error(`Database Backup Failure: ${error}`);
await this.storageRepository
.unlink(backupFilePath)
- .catch((error) => this.logger.error('Failed to delete failed backup file', error));
+ .catch((error) => this.logger.error(`Failed to delete failed backup file: ${error}`));
throw error;
}
diff --git a/server/src/services/library.service.ts b/server/src/services/library.service.ts
index f4a1992d91..5f78fa3629 100644
--- a/server/src/services/library.service.ts
+++ b/server/src/services/library.service.ts
@@ -245,7 +245,7 @@ export class LibraryService extends BaseService {
job.paths.map((path) =>
this.processEntity(path, library.ownerId, job.libraryId)
.then((asset) => assetImports.push(asset))
- .catch((error: any) => this.logger.error(`Error processing ${path} for library ${job.libraryId}`, error)),
+ .catch((error: any) => this.logger.error(`Error processing ${path} for library ${job.libraryId}: ${error}`)),
),
);
diff --git a/server/src/services/memory.service.ts b/server/src/services/memory.service.ts
index 7bf9deab4b..1d39169f3e 100644
--- a/server/src/services/memory.service.ts
+++ b/server/src/services/memory.service.ts
@@ -40,7 +40,7 @@ export class MemoryService extends BaseService {
try {
await Promise.all(users.map((owner, i) => this.createOnThisDayMemories(owner.id, usersIds[i], target)));
} catch (error) {
- this.logger.error(`Failed to create memories for ${target.toISO()}`, error);
+ this.logger.error(`Failed to create memories for ${target.toISO()}: ${error}`);
}
// update system metadata even when there is an error to minimize the chance of duplicates
await this.systemMetadataRepository.set(SystemMetadataKey.MemoriesState, {
diff --git a/server/src/services/storage-template.service.ts b/server/src/services/storage-template.service.ts
index 6086d62809..1d38bf7011 100644
--- a/server/src/services/storage-template.service.ts
+++ b/server/src/services/storage-template.service.ts
@@ -338,7 +338,7 @@ export class StorageTemplateService extends BaseService {
return destination;
} catch (error: any) {
- this.logger.error(`Unable to get template path for ${filename}`, error);
+ this.logger.error(`Unable to get template path for ${filename}: ${error}`);
return asset.originalPath;
}
}
diff --git a/server/src/services/version.service.ts b/server/src/services/version.service.ts
index c4d7e9974d..b817363eac 100644
--- a/server/src/services/version.service.ts
+++ b/server/src/services/version.service.ts
@@ -95,7 +95,7 @@ export class VersionService extends BaseService {
this.eventRepository.clientBroadcast('on_new_release', asNotification(metadata));
}
} catch (error: Error | any) {
- this.logger.warn(`Unable to run version check: ${error}`, error?.stack);
+ this.logger.warn(`Unable to run version check: ${error}\n${error?.stack}`);
return JobStatus.Failed;
}
diff --git a/server/src/utils/file.ts b/server/src/utils/file.ts
index 2331a45a62..29c7f6f772 100644
--- a/server/src/utils/file.ts
+++ b/server/src/utils/file.ts
@@ -73,7 +73,7 @@ export const sendFile = async (
// log non-http errors
if (error instanceof HttpException === false) {
- logger.error(`Unable to send file: ${error.name}`, error.stack);
+ logger.error(`Unable to send file: ${error}`, error.stack);
}
res.header('Cache-Control', 'none');