Skip to content

[EchoLayer (Dev)] DO NOT MERGE #608

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

Closed
echolayer-dev-karl wants to merge 3 commits into from
Closed

[EchoLayer (Dev)] DO NOT MERGE #608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e661066
Will update soon
Apr 24, 2024
fdf120f
Will update soon
Apr 24, 2024
9d35344
Will update soon
Apr 24, 2024
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
9 changes: 7 additions & 2 deletions codex-vscode/src/helpers/logging.helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const consoleFormat = winston.format.printf(({ level, message, timestamp, ...met
try {
message += `\n${JSON.stringify(meta, undefined, 2)}`;
} catch (error) {
// Couldn't parse object ¯\_(ツ)_/¯
// Couldn't parse object \\_()\_/\u00af
}
}
}
Expand All @@ -38,6 +38,10 @@ const sentryFormat = winston.format((info: winston.Logform.TransformableInfo) =>
};
});

// Valid log levels for SENTRY_LOG_LEVEL are 'error', 'warn', 'info', 'http', 'verbose', 'debug', 'silly'
const validLogLevels = ['error', 'warn', 'info', 'http', 'verbose', 'debug', 'silly'];
const sentryLogLevel = process.env.SENTRY_LOG_LEVEL && validLogLevels.includes(process.env.SENTRY_LOG_LEVEL) ? process.env.SENTRY_LOG_LEVEL : 'error';

const options = {
sentry: {
name: "vscode",
Expand All @@ -46,7 +50,7 @@ const options = {
environment: process.env.ENVIRONMENT || "development",
normalizeDepth: 10,
},
level: process.env.SENTRY_LOG_LEVEL || "error",
level: sentryLogLevel,
format: sentryFormat(),
};

Expand Down Expand Up @@ -80,3 +84,4 @@ function configureLogger() {
configureLogger();

export default logger;

2 changes: 1 addition & 1 deletion codex-vscode/src/services/git.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ export class GitService implements Singleton {
return originRepo;
}

logger.info(`Could not find repo origin - gitService.getFetchOrigin`, {
logger.info(`Could not find repo origin - gitService.getRemote`, {
repositoryRemotes: repository?.state?.remotes,
});
// We couldn't find a repo w/ Origin as it's name, so we'll naively take the first one
Expand Down