Skip to content

Commit af6534f

Browse files
committed
add logger package to dockerfile and cleanup
1 parent 337eedc commit af6534f

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

Dockerfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,13 @@ COPY ./packages/db ./packages/db
4242
COPY ./packages/schemas ./packages/schemas
4343
COPY ./packages/crypto ./packages/crypto
4444
COPY ./packages/error ./packages/error
45+
COPY ./packages/logger ./packages/logger
4546

4647
RUN yarn workspace @sourcebot/db install
4748
RUN yarn workspace @sourcebot/schemas install
4849
RUN yarn workspace @sourcebot/crypto install
4950
RUN yarn workspace @sourcebot/error install
51+
RUN yarn workspace @sourcebot/logger install
5052
# ------------------------------------
5153

5254
# ------ Build Web ------
@@ -89,6 +91,7 @@ COPY --from=shared-libs-builder /app/packages/db ./packages/db
8991
COPY --from=shared-libs-builder /app/packages/schemas ./packages/schemas
9092
COPY --from=shared-libs-builder /app/packages/crypto ./packages/crypto
9193
COPY --from=shared-libs-builder /app/packages/error ./packages/error
94+
COPY --from=shared-libs-builder /app/packages/logger ./packages/logger
9295

9396
# Fixes arm64 timeouts
9497
RUN yarn workspace @sourcebot/web install
@@ -128,6 +131,7 @@ COPY --from=shared-libs-builder /app/packages/db ./packages/db
128131
COPY --from=shared-libs-builder /app/packages/schemas ./packages/schemas
129132
COPY --from=shared-libs-builder /app/packages/crypto ./packages/crypto
130133
COPY --from=shared-libs-builder /app/packages/error ./packages/error
134+
COPY --from=shared-libs-builder /app/packages/logger ./packages/logger
131135
RUN yarn workspace @sourcebot/backend install
132136
RUN yarn workspace @sourcebot/backend build
133137

@@ -209,6 +213,7 @@ COPY --from=shared-libs-builder /app/packages/db ./packages/db
209213
COPY --from=shared-libs-builder /app/packages/schemas ./packages/schemas
210214
COPY --from=shared-libs-builder /app/packages/crypto ./packages/crypto
211215
COPY --from=shared-libs-builder /app/packages/error ./packages/error
216+
COPY --from=shared-libs-builder /app/packages/logger ./packages/logger
212217

213218
# Configure dependencies
214219
RUN apk add --no-cache git ca-certificates bind-tools tini jansson wget supervisor uuidgen curl perl jq redis postgresql postgresql-contrib openssl util-linux unzip

docs/docs/configuration/environment-variables.mdx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ The following environment variables allow you to configure your Sourcebot deploy
2626
| `SMTP_CONNECTION_URL` | `-` | <p>The url to the SMTP service used for sending transactional emails. See [this doc](/docs/configuration/transactional-emails) for more info.</p> |
2727
| `SOURCEBOT_ENCRYPTION_KEY` | Automatically generated at startup if no value is provided. Generated using `openssl rand -base64 24` | <p>Used to encrypt connection secrets and generate API keys.</p> |
2828
| `SOURCEBOT_LOG_LEVEL` | `info` | <p>The Sourcebot logging level. Valid values are `debug`, `info`, `warn`, `error`, in order of severity.</p> |
29-
| `SOURCEBOT_TELEMETRY_DISABLED` | `false` | <p>Enables/disables telemetry collection in Sourcebot. See [this doc](/self-hosting/security/telemetry) for more info.</p> |
29+
| `SOURCEBOT_STRUCTURED_LOGGING_ENABLED` | `false` | <p>Enables/disable structured JSON logging. See [this doc](/docs/configuration/transactional-emails) for more info.</p> |
30+
| `SOURCEBOT_STRUCTURED_LOGGING_FILE` | - | <p>Optional file to log to if structured logging is enabled</p> |
31+
| `SOURCEBOT_TELEMETRY_DISABLED` | `false` | <p>Enables/disables telemetry collection in Sourcebot. See [this doc](/docs/more/structured-logging) for more info.</p> |
3032
| `TOTAL_MAX_MATCH_COUNT` | `100000` | <p>The maximum number of matches per query</p> |
3133
| `ZOEKT_MAX_WALL_TIME_MS` | `10000` | <p>The maximum real world duration (in milliseconds) per zoekt query</p> |
3234

packages/backend/src/env.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ dotenv.config({
2222
export const env = createEnv({
2323
server: {
2424
SOURCEBOT_ENCRYPTION_KEY: z.string(),
25-
SOURCEBOT_LOG_LEVEL: z.enum(["info", "debug", "warn", "error"]).default("info"),
26-
SOURCEBOT_STRUCTURED_LOGGING_ENABLED: booleanSchema.default("false"),
27-
SOURCEBOT_STRUCTURED_LOGGING_FILE: z.string().optional(),
2825
SOURCEBOT_TELEMETRY_DISABLED: booleanSchema.default("false"),
2926
SOURCEBOT_INSTALL_ID: z.string().default("unknown"),
3027
NEXT_PUBLIC_SOURCEBOT_VERSION: z.string().default("unknown"),

packages/web/src/env.mjs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@ export const env = createEnv({
5656
STRIPE_WEBHOOK_SECRET: z.string().optional(),
5757
STRIPE_ENABLE_TEST_CLOCKS: booleanSchema.default('false'),
5858

59-
// Logging
60-
SOURCEBOT_LOG_LEVEL: z.enum(["debug", "info", "warn", "error"]).default("info"),
61-
SOURCEBOT_STRUCTURED_LOGGING_ENABLED: booleanSchema.default('false'),
62-
6359
// Misc
6460
CONFIG_MAX_REPOS_NO_TOKEN: numberSchema.default(Number.MAX_SAFE_INTEGER),
6561
NODE_ENV: z.enum(["development", "test", "production"]),

0 commit comments

Comments
 (0)