Skip to content

Commit ebfcce3

Browse files
authored
Merge pull request #1589 from github/aeisenberg/load-database-logging
Add better logging while loading databases
2 parents 159d900 + 46233b9 commit ebfcce3

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

extensions/ql-vscode/src/databases.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -358,14 +358,12 @@ export class DatabaseItemImpl implements DatabaseItem {
358358
try {
359359
this._contents = await resolveDatabaseContents(this.databaseUri);
360360
this._error = undefined;
361-
}
362-
catch (e) {
361+
} catch (e) {
363362
this._contents = undefined;
364363
this._error = e instanceof Error ? e : new Error(String(e));
365364
throw e;
366365
}
367-
}
368-
finally {
366+
} finally {
369367
this.onChanged({
370368
kind: DatabaseEventKind.Refresh,
371369
item: this
@@ -707,6 +705,7 @@ export class DatabaseManager extends DisposableObject {
707705
step
708706
});
709707
try {
708+
void this.logger.log(`Found ${databases.length} persisted databases: ${databases.map(db => db.uri).join(', ')}`);
710709
for (const database of databases) {
711710
progress({
712711
maxStep: databases.length,
@@ -721,16 +720,19 @@ export class DatabaseManager extends DisposableObject {
721720
if (currentDatabaseUri === database.uri) {
722721
await this.setCurrentDatabaseItem(databaseItem, true);
723722
}
724-
}
725-
catch (e) {
723+
void this.logger.log(`Loaded database ${databaseItem.name} at URI ${database.uri}.`);
724+
} catch (e) {
726725
// When loading from persisted state, leave invalid databases in the list. They will be
727726
// marked as invalid, and cannot be set as the current database.
727+
void this.logger.log(`Error loading database ${database.uri}: ${e}.`);
728728
}
729729
}
730730
} catch (e) {
731731
// database list had an unexpected type - nothing to be done?
732732
void showAndLogErrorMessage(`Database list loading failed: ${getErrorMessage(e)}`);
733733
}
734+
735+
void this.logger.log('Finished loading persisted databases.');
734736
});
735737
}
736738

0 commit comments

Comments
 (0)