Merge pull request #215 from NarrativeScience/fix/file-input-durability

Adds error handling for removing watched files
NarrativeScience-old · Jan 16, 2020 · 91906e4 · 91906e4
2 parents 2e91c5f + c2a46a6
commit 91906e4
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 19 deletions.
diff --git a/inputs/file/package-lock.json b/inputs/file/package-lock.json
diff --git a/inputs/file/package.json b/inputs/file/package.json
@@ -1,6 +1,6 @@
 {
   "name": "log.io-file-input",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "description": "Watches files on disk and sends new messages to the server",
   "homepage": "http://logio.org",
   "repository": {

diff --git a/inputs/file/src/input.ts b/inputs/file/src/input.ts
@@ -54,8 +54,9 @@ async function sendNewMessages(
     fd = await openAsync(filePath, 'r')
     fds[filePath] = fd
   }
-  const readBuffer = Buffer.alloc(newSize - oldSize)
-  await readAsync(fd, readBuffer, 0, newSize - oldSize, oldSize)
+  const offset = Math.max(newSize - oldSize, 0)
+  const readBuffer = Buffer.alloc(offset)
+  await readAsync(fd, readBuffer, 0, offset, oldSize)
   const messages = readBuffer.toString().split('\r\n').filter(msg => !!msg.trim())
   messages.forEach((message) => {
     client.write(`+msg|${streamName}|${sourceName}|${message}\0`)
@@ -85,17 +86,20 @@ async function startFileWatcher(
   const fileSizes = await initializeFileSizes(inputPath, isDir)
   const watcher = fs.watch(inputPath)
   watcher.on('change', async (eventType: string, fileName: string) => {
+    if (eventType === 'rename') { return }
     const filePath = isDir ? path.join(inputPath, fileName) : inputPath
-    const newSize = (await statAsync(filePath)).size
-    await sendNewMessages(
-      client,
-      streamName,
-      sourceName,
-      filePath,
-      newSize,
-      fileSizes[filePath] || 0,
-    )
-    fileSizes[filePath] = newSize
+    try {
+      const newSize = (await statAsync(filePath)).size
+      await sendNewMessages(
+        client,
+        streamName,
+        sourceName,
+        filePath,
+        newSize,
+        fileSizes[filePath] || 0,
+      )
+      fileSizes[filePath] = newSize
+    } catch {}
   })
 }
 

diff --git a/server/package-lock.json b/server/package-lock.json
diff --git a/server/package.json b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "log.io",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "description": "Listens for new messages over TCP and broadcasts to browsers via socket.io",
   "homepage": "http://logio.org",
   "repository": {

diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "log.io-ui",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "license": "Apache-2.0",
   "private": true,
   "dependencies": {

diff --git a/ui/src/components/screens/styles.scss b/ui/src/components/screens/styles.scss
@@ -70,7 +70,7 @@
   div {
     font-size: 12px;
     line-height: 16px;
-    color: #72E34C;
+    color: #7AEE4F;
     white-space: pre-wrap;
   }
 }