Skip to content

fix(component): fix warning for invalid log levels #36

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

Open
ic4l4s9c wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(component): fix warning for invalid log levels #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 5 additions & 8 deletions src/client/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type {
} from "convex/server";
import type { Point, Primitive, Rectangle } from "../component/types.js";
import { point, rectangle } from "../component/types.js";
import type { LogLevel } from "../component/lib/logging.js";
import { LOG_LEVELS, type LogLevel } from "../component/lib/logging.js";
import { FilterBuilderImpl, type GeospatialQuery } from "./query.js";
import type { ComponentApi } from "../component/_generated/component.js";

Expand Down Expand Up @@ -100,16 +100,13 @@ export class GeospatialIndex<
) {
let DEFAULT_LOG_LEVEL: LogLevel = "INFO";
if (process.env.GEOSPATIAL_LOG_LEVEL) {
if (
!["DEBUG", "INFO", "WARN", "ERROR"].includes(
process.env.GEOSPATIAL_LOG_LEVEL,
)
) {
if (LOG_LEVELS.includes(process.env.GEOSPATIAL_LOG_LEVEL)) {
DEFAULT_LOG_LEVEL = process.env.GEOSPATIAL_LOG_LEVEL as LogLevel;
} else {
console.warn(
`Invalid log level (${process.env.GEOSPATIAL_LOG_LEVEL}), defaulting to "INFO"`,
`Invalid log level (${process.env.GEOSPATIAL_LOG_LEVEL}), defaulting to "${DEFAULT_LOG_LEVEL}"`,
);
}
DEFAULT_LOG_LEVEL = process.env.GEOSPATIAL_LOG_LEVEL as LogLevel;
}
this.logLevel = options?.logLevel ?? DEFAULT_LOG_LEVEL;
this.minLevel = options?.minLevel ?? DEFAULT_MIN_LEVEL;
Expand Down
4 changes: 3 additions & 1 deletion src/component/lib/logging.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@ export type Logger = {
timeEnd: (label: string) => void;
};

export const LOG_LEVELS = ["DEBUG", "INFO", "WARN", "ERROR"];

export function createLogger(level: LogLevel): Logger {
const levelIndex = ["DEBUG", "INFO", "WARN", "ERROR"].indexOf(level);
const levelIndex = LOG_LEVELS.indexOf(level);
if (levelIndex === -1) {
throw new Error(`Invalid log level: ${level}`);
}
Expand Down