Remove run_monitor.js

Close #405
ethereum · Mar 5, 2021 · ed4de1d · ed4de1d
1 parent b6e66ee
commit ed4de1d
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 12 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -26,7 +26,7 @@
       "type": "node",
       "request": "launch",
       "name": "Monitor",
-      "program": "${workspaceFolder}/scripts/run_monitor.js",
+      "program": "${workspaceFolder}/dist/monitor/monitor.js",
       "envFile": "${workspaceFolder}/environments/.env",
       "preLaunchTask": "npm: build:lerna",
       "outFiles": [

diff --git a/package.json b/package.json
@@ -24,8 +24,8 @@
     "dev:server:local": "npm run build:ui && TESTING=true ./scripts/run_server.sh",
     "build:ui": "cd ./ui/ && npm install && npm run build",
     "monitor:build": "npm run clean && npm run build",
-    "monitor:start": "node ./scripts/run_monitor.js",
-    "monitor": "rimraf ./dist && tsc && node ./scripts/run_monitor.js",
+    "monitor:start": "node ./dist/monitor/monitor.js",
+    "monitor": "rimraf ./dist && tsc && node ./dist/monitor/monitor.js",
     "monitor:ci": "scripts/monitor_ci.sh",
     "server:build": "npm run clean && npm run build",
     "server:start": "node ./dist/server/server.js",

diff --git a/scripts/run_monitor.js b/scripts/run_monitor.js
diff --git a/src/Dockerfile.monitor b/src/Dockerfile.monitor
@@ -6,7 +6,6 @@ COPY services/core ./services/core
 COPY services/validation ./services/validation
 COPY services/verification ./services/verification
 COPY src ./src
-COPY scripts/run_monitor.js ./scripts/
 COPY *.json ./
 RUN npx lerna bootstrap && npx lerna run build
 

diff --git a/src/config.ts b/src/config.ts
@@ -12,7 +12,7 @@ export default {
     },
     server: {
         port: process.env.SERVER_PORT || 5000,
-        url: process.env.SERVER_URL || "http//localhost:5000"
+        url: process.env.SERVER_URL || "http://localhost:5000"
     },
     localchain: {
         port: process.env.LOCALCHAIN_PORT || 8545,

diff --git a/src/monitor/monitor.ts b/src/monitor/monitor.ts
@@ -197,4 +197,9 @@ export default class Monitor {
         this.chainMonitors.forEach(cm => cm.stop());
         this.sourceFetcher.stop();
     }
+}
+
+if (require.main === module) {
+    const monitor = new Monitor();
+    monitor.start();
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -11,5 +11,5 @@
     "declaration": true,
     "module": "commonjs"
   },
-  "include": ["./src", "src/run_monitor.js", "src/localchain.js", "src/cli"]
+  "include": ["./src", "src/localchain.js", "src/cli"]
 }