WIP - Thu, Nov 23 10:33 PM

gadget-inc · Nov 24, 2023 · 8411cd8 · 8411cd8
1 parent 214af01
commit 8411cd8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/src/services/filesync/filesync.ts b/src/services/filesync/filesync.ts
@@ -51,9 +51,11 @@ export class FileSync {
   readonly log = createLogger({
     name: "filesync",
     fields: () => ({
-      app: this.app.slug,
-      filesVersion: String(this.filesVersion),
-      mtime: this.mtime,
+      state: {
+        app: this.app.slug,
+        filesVersion: String(this.filesVersion),
+        mtime: this.mtime,
+      },
     }),
   });
 
@@ -357,6 +359,7 @@ export class FileSync {
 
         const stats = await fs.stat(this.directory.absolute(normalizedPath));
         if (stats.mtime.getTime() > this.mtime) {
+          this.log.trace("detected local change", { path: normalizedPath, mtime: stats.mtime.getTime() });
           changes.set(normalizedPath, { type: "update" });
         }
       }
@@ -491,7 +494,7 @@ export class FileSync {
       },
     });
 
-    await this._save({ filesVersion: remoteFilesVersion, mtime: Date.now() });
+    await this._save({ filesVersion: remoteFilesVersion, mtime: Date.now() + 1 });
 
     printlns`→ Sent {gray ${dayjs().format("hh:mm:ss A")}}`;
     printChanges({ changes, tense: "present", limit: 10, mt: 0 });
@@ -561,7 +564,7 @@ export class FileSync {
       }
     });
 
-    await this._save({ filesVersion: String(filesVersion), mtime: Date.now() });
+    await this._save({ filesVersion: String(filesVersion), mtime: Date.now() + 1 });
 
     return new Changes([
       ...created.map((path) => [path, { type: "create" }] as const),

diff --git a/src/services/output/log/log.ts b/src/services/output/log/log.ts
@@ -37,22 +37,25 @@ export const createLogger = ({
 }): Logger => {
   const createLog = (level: Level): Log => {
     return (msg, messageFields) => {
+      const shouldLog = alwaysEnabled || (config.debug && isLevelEnabled(level));
+      const shouldSendToSentry = level >= Level.INFO;
+      if (!shouldLog && !shouldSendToSentry) {
+        return;
+      }
+
       const fields = { ...unthunk(globalFields), ...unthunk(loggerFields), ...messageFields };
       if ("error" in fields) {
         fields.error = serializeError(fields.error);
       }
 
-      if (alwaysEnabled || (config.debug && isLevelEnabled(level))) {
+      if (shouldLog) {
         const format = formatters[config.format];
         stream.write(format(level, name, msg, fields));
       }
 
-      if (level < Level.INFO) {
-        // don't send debug logs to Sentry
-        return;
+      if (shouldSendToSentry) {
+        addSentryBreadcrumb({ level: "log", message: msg, data: fields });
       }
-
-      addSentryBreadcrumb({ level: "log", message: msg, data: fields });
     };
   };