Skip to content

Commit 5269e78

Browse files
committed
CR-277: Change log to debug calls, log additional metadata
1 parent 632ac08 commit 5269e78

File tree

91 files changed

+478
-459
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+478
-459
lines changed

redisinsight/api/src/exceptions/global-exception.filter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { ArgumentsHost, Logger } from '@nestjs/common';
33
import { Request, Response } from 'express';
44

55
export class GlobalExceptionFilter extends BaseExceptionFilter {
6-
private staticServerLogger = new Logger('StaticServerLogger');
6+
private staticServerLogger = new Logger('GlobalExceptionFilter');
77

88
catch(exception: Error, host: ArgumentsHost) {
99
const ctx = host.switchToHttp();

redisinsight/api/src/modules/ai/query/ai-query.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ export class AiQueryService {
178178

179179
return cb(indexContext);
180180
} catch (e) {
181-
this.logger.warn('Unable to create index context', e);
181+
this.logger.warn('Unable to create index context', e, sessionMetadata);
182182
return cb(e.message);
183183
}
184184
});
@@ -191,7 +191,7 @@ export class AiQueryService {
191191

192192
return cb(await client.sendCommand(data, { replyEncoding: 'utf8' }));
193193
} catch (e) {
194-
this.logger.warn('Query execution error', e);
194+
this.logger.warn('Query execution error', e, sessionMetadata);
195195
return cb(e.message);
196196
}
197197
});

redisinsight/api/src/modules/ai/query/repositories/local.ai-query.message.repository.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export class LocalAiQueryMessageRepository extends AiQueryMessageRepository {
7171
.map((entity) => classToClass(AiQueryMessage, entity));
7272
}
7373

74-
async createMany(_sessionMetadata: SessionMetadata, messages: AiQueryMessage[]): Promise<void> {
74+
async createMany(sessionMetadata: SessionMetadata, messages: AiQueryMessage[]): Promise<void> {
7575
const entities = await Promise.all(messages.map(async (message) => {
7676
const entity = classToClass(AiQueryMessageEntity, message);
7777

@@ -84,7 +84,7 @@ export class LocalAiQueryMessageRepository extends AiQueryMessageRepository {
8484
try {
8585
await this.cleanupDatabaseHistory(entities[0].databaseId, entities[0].accountId);
8686
} catch (e) {
87-
this.logger.error('Error when trying to cleanup history after insert', e);
87+
this.logger.error('Error when trying to cleanup history after insert', e, sessionMetadata);
8888
}
8989
}
9090

redisinsight/api/src/modules/browser/browser-history/browser-history.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export class BrowserHistoryService {
3232
const history = plainToClass(BrowserHistory, { ...dto, databaseId: clientMetadata.databaseId });
3333
return this.browserHistoryRepository.create(clientMetadata.sessionMetadata, history);
3434
} catch (e) {
35-
this.logger.error('Unable to create browser history item', e);
35+
this.logger.error('Unable to create browser history item', e, clientMetadata);
3636

3737
if (e instanceof HttpException) {
3838
throw e;
@@ -92,7 +92,7 @@ export class BrowserHistoryService {
9292
mode: BrowserHistoryMode,
9393
ids: string[],
9494
): Promise<DeleteBrowserHistoryItemsResponse> {
95-
this.logger.log(`Deleting many browser history items: ${ids}`);
95+
this.logger.debug(`Deleting many browser history items: ${ids}`, sessionMetadata);
9696

9797
return {
9898
affected: sum(await Promise.all(ids.map(async (id) => {

redisinsight/api/src/modules/browser/browser-history/repositories/local.browser-history.repository.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export class LocalBrowserHistoryRepository extends BrowserHistoryRepository {
4545
try {
4646
await this.cleanupDatabaseHistory(sessionMetadata, entity.databaseId, entity.mode);
4747
} catch (e) {
48-
this.logger.error('Error when trying to cleanup history after insert', e);
48+
this.logger.error('Error when trying to cleanup history after insert', e, sessionMetadata);
4949
}
5050

5151
return classToClass(BrowserHistory, await this.modelEncryptor.decryptEntity(entity));
@@ -55,11 +55,11 @@ export class LocalBrowserHistoryRepository extends BrowserHistoryRepository {
5555
* Fetches entity, decrypt and return full BrowserHistory model
5656
* @param id
5757
*/
58-
async get(_sessionMetadata: SessionMetadata, id: string): Promise<BrowserHistory> {
58+
async get(sessionMetadata: SessionMetadata, id: string): Promise<BrowserHistory> {
5959
const entity = await this.repository.findOneBy({ id });
6060

6161
if (!entity) {
62-
this.logger.error(`Browser history item with id:${id} was not Found`);
62+
this.logger.error(`Browser history item with id:${id} was not Found`, sessionMetadata);
6363
throw new NotFoundException(ERROR_MESSAGES.BROWSER_HISTORY_ITEM_NOT_FOUND);
6464
}
6565

@@ -72,11 +72,11 @@ export class LocalBrowserHistoryRepository extends BrowserHistoryRepository {
7272
* @param mode
7373
*/
7474
async list(
75-
_sessionMetadata: SessionMetadata,
75+
sessionMetadata: SessionMetadata,
7676
databaseId: string,
7777
mode: BrowserHistoryMode,
7878
): Promise<BrowserHistory[]> {
79-
this.logger.log('Getting browser history list');
79+
this.logger.debug('Getting browser history list', sessionMetadata);
8080
const entities = await this.repository
8181
.createQueryBuilder('a')
8282
.where({ databaseId, mode })
@@ -90,7 +90,7 @@ export class LocalBrowserHistoryRepository extends BrowserHistoryRepository {
9090
.limit(BROWSER_HISTORY_CONFIG.maxItemsPerModeInDb)
9191
.getMany();
9292

93-
this.logger.log('Succeed to get history list');
93+
this.logger.debug('Succeed to get history list', sessionMetadata);
9494

9595
const decryptedEntities = await Promise.all(
9696
entities.map<Promise<BrowserHistoryEntity>>(async (entity) => {
@@ -112,14 +112,14 @@ export class LocalBrowserHistoryRepository extends BrowserHistoryRepository {
112112
* @param mode
113113
* @param id
114114
*/
115-
async delete(_: SessionMetadata, databaseId: string, mode: BrowserHistoryMode, id: string): Promise<void> {
116-
this.logger.log(`Deleting browser history item: ${id}`);
115+
async delete(sessionMetadata: SessionMetadata, databaseId: string, mode: BrowserHistoryMode, id: string): Promise<void> {
116+
this.logger.debug(`Deleting browser history item: ${id}`, sessionMetadata);
117117
try {
118118
await this.repository.delete({ id, databaseId, mode });
119119
// todo: rethink
120-
this.logger.log('Succeed to delete browser history item.');
120+
this.logger.debug('Succeed to delete browser history item.', sessionMetadata);
121121
} catch (error) {
122-
this.logger.error(`Failed to delete history items: ${id}`, error);
122+
this.logger.error(`Failed to delete history items: ${id}`, error, sessionMetadata);
123123
throw new InternalServerErrorException();
124124
}
125125
}

redisinsight/api/src/modules/browser/hash/hash.service.ts

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export class HashService {
5555
dto: CreateHashWithExpireDto,
5656
): Promise<void> {
5757
try {
58-
this.logger.log('Creating Hash data type.');
58+
this.logger.debug('Creating Hash data type.', clientMetadata);
5959
const { keyName, fields, expire } = dto;
6060
const client: RedisClient = await this.databaseClientFactory.getOrCreateClient(clientMetadata);
6161

@@ -79,9 +79,9 @@ export class HashService {
7979
// todo: rethink
8080
catchMultiTransactionError(transactionResults);
8181

82-
this.logger.log('Succeed to create Hash data type.');
82+
this.logger.debug('Succeed to create Hash data type.', clientMetadata);
8383
} catch (error) {
84-
this.logger.error('Failed to create Hash data type.', error);
84+
this.logger.error('Failed to create Hash data type.', error, clientMetadata);
8585
throw catchAclError(error);
8686
}
8787
}
@@ -91,7 +91,7 @@ export class HashService {
9191
dto: GetHashFieldsDto,
9292
): Promise<GetHashFieldsResponse> {
9393
try {
94-
this.logger.log('Getting fields of the Hash data type stored at key.');
94+
this.logger.debug('Getting fields of the Hash data type stored at key.', clientMetadata);
9595
const { keyName, cursor, match } = dto;
9696
const client: RedisClient = await this.databaseClientFactory.getOrCreateClient(clientMetadata);
9797
let result: GetHashFieldsResponse = {
@@ -103,7 +103,7 @@ export class HashService {
103103

104104
result.total = await client.sendCommand([BrowserToolHashCommands.HLen, keyName]) as number;
105105
if (!result.total) {
106-
this.logger.error(`Failed to get fields of the Hash data type. Not Found key: ${keyName}.`);
106+
this.logger.error(`Failed to get fields of the Hash data type. Not Found key: ${keyName}.`, clientMetadata);
107107
return Promise.reject(new NotFoundException(ERROR_MESSAGES.KEY_NOT_EXIST));
108108
}
109109
if (match && !isRedisGlob(match)) {
@@ -133,7 +133,7 @@ export class HashService {
133133
});
134134
}
135135
} catch (e) {
136-
this.logger.warn('Unable to get ttl for hash fields');
136+
this.logger.warn('Unable to get ttl for hash fields', e, clientMetadata);
137137
// ignore error
138138
}
139139

@@ -143,10 +143,10 @@ export class HashService {
143143
{ total: result.total, keyName },
144144
);
145145

146-
this.logger.log('Succeed to get fields of the Hash data type.');
146+
this.logger.debug('Succeed to get fields of the Hash data type.', clientMetadata);
147147
return plainToClass(GetHashFieldsResponse, result);
148148
} catch (error) {
149-
this.logger.error('Failed to get fields of the Hash data type.', error);
149+
this.logger.error('Failed to get fields of the Hash data type.', error, clientMetadata);
150150
if (error.message.includes(RedisErrorCodes.WrongType)) {
151151
throw new BadRequestException(error.message);
152152
}
@@ -159,7 +159,7 @@ export class HashService {
159159
dto: AddFieldsToHashDto,
160160
): Promise<void> {
161161
try {
162-
this.logger.log('Adding fields to the Hash data type.');
162+
this.logger.debug('Adding fields to the Hash data type.', clientMetadata);
163163
const { keyName, fields } = dto;
164164
const client: RedisClient = await this.databaseClientFactory.getOrCreateClient(clientMetadata);
165165

@@ -179,9 +179,9 @@ export class HashService {
179179
// todo: rethink
180180
catchMultiTransactionError(transactionResults);
181181

182-
this.logger.log('Succeed to add fields to Hash data type.');
182+
this.logger.debug('Succeed to add fields to Hash data type.', clientMetadata);
183183
} catch (error) {
184-
this.logger.error('Failed to add fields to Hash data type.', error);
184+
this.logger.error('Failed to add fields to Hash data type.', error, clientMetadata);
185185
if (error.message.includes(RedisErrorCodes.WrongType)) {
186186
throw new BadRequestException(error.message);
187187
}
@@ -194,7 +194,7 @@ export class HashService {
194194
dto: UpdateHashFieldsTtlDto,
195195
): Promise<void> {
196196
try {
197-
this.logger.log('Updating hash fields ttl.');
197+
this.logger.debug('Updating hash fields ttl.', clientMetadata);
198198
const { keyName, fields } = dto;
199199

200200
const client: RedisClient = await this.databaseClientFactory.getOrCreateClient(clientMetadata);
@@ -217,9 +217,9 @@ export class HashService {
217217
catchMultiTransactionError(transactionResults);
218218
}
219219

220-
this.logger.log('Successfully updated hash fields ttl');
220+
this.logger.debug('Successfully updated hash fields ttl', clientMetadata);
221221
} catch (error) {
222-
this.logger.error('Failed to update hash fields ttl.', error);
222+
this.logger.error('Failed to update hash fields ttl.', error, clientMetadata);
223223
if (error.message.includes(RedisErrorCodes.WrongType)) {
224224
throw new BadRequestException(error.message);
225225
}
@@ -232,18 +232,18 @@ export class HashService {
232232
dto: DeleteFieldsFromHashDto,
233233
): Promise<DeleteFieldsFromHashResponse> {
234234
try {
235-
this.logger.log('Deleting fields from the Hash data type.');
235+
this.logger.debug('Deleting fields from the Hash data type.', clientMetadata);
236236
const { keyName, fields } = dto;
237237
const client: RedisClient = await this.databaseClientFactory.getOrCreateClient(clientMetadata);
238238

239239
await checkIfKeyNotExists(keyName, client);
240240

241241
const result = await client.sendCommand([BrowserToolHashCommands.HDel, keyName, ...fields]) as number;
242242

243-
this.logger.log('Succeed to delete fields from the Hash data type.');
243+
this.logger.debug('Succeed to delete fields from the Hash data type.', clientMetadata);
244244
return { affected: result };
245245
} catch (error) {
246-
this.logger.error('Failed to delete fields from the Hash data type.', error);
246+
this.logger.error('Failed to delete fields from the Hash data type.', error, clientMetadata);
247247
if (error.message.includes(RedisErrorCodes.WrongType)) {
248248
throw new BadRequestException(error.message);
249249
}

redisinsight/api/src/modules/browser/keys/key-info/strategies/graph.key-info.strategy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export class GraphKeyInfoStrategy extends KeyInfoStrategy {
1313
key: RedisString,
1414
type: string,
1515
): Promise<GetKeyInfoResponse> {
16-
this.logger.log(`Getting ${RedisDataType.Graph} type info.`);
16+
this.logger.debug(`Getting ${RedisDataType.Graph} type info.`);
1717
const [
1818
[, ttl = null],
1919
[, size = null],

redisinsight/api/src/modules/browser/keys/key-info/strategies/hash.key-info.strategy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export class HashKeyInfoStrategy extends KeyInfoStrategy {
1313
key: RedisString,
1414
type: string,
1515
): Promise<GetKeyInfoResponse> {
16-
this.logger.log(`Getting ${RedisDataType.Hash} type info.`);
16+
this.logger.debug(`Getting ${RedisDataType.Hash} type info.`);
1717

1818
const [
1919
[, ttl = null],

redisinsight/api/src/modules/browser/keys/key-info/strategies/list.key-info.strategy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export class ListKeyInfoStrategy extends KeyInfoStrategy {
1313
key: RedisString,
1414
type: string,
1515
): Promise<GetKeyInfoResponse> {
16-
this.logger.log(`Getting ${RedisDataType.List} type info.`);
16+
this.logger.debug(`Getting ${RedisDataType.List} type info.`);
1717

1818
const [
1919
[, ttl = null],

redisinsight/api/src/modules/browser/keys/key-info/strategies/rejson-rl.key-info.strategy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export class RejsonRlKeyInfoStrategy extends KeyInfoStrategy {
1313
key: RedisString,
1414
type: string,
1515
): Promise<GetKeyInfoResponse> {
16-
this.logger.log(`Getting ${RedisDataType.JSON} type info.`);
16+
this.logger.debug(`Getting ${RedisDataType.JSON} type info.`);
1717
const [
1818
[, ttl = null],
1919
[, size = null],

0 commit comments

Comments
 (0)