Merge pull request #1 from terass-inc/feature/exec-parallel

並列実行を可能にする対応
terass-inc · Mar 1, 2022 · 9e004f4 · 9e004f4
2 parents a03a754 + 5b362da
commit 9e004f4
Show file tree

Hide file tree

Showing 40 changed files with 127,788 additions and 131 deletions.
diff --git a/.gitignore b/.gitignore
@@ -104,4 +104,3 @@ dist
 .tern-port
 
 cache
-db
diff --git a/bin/server.js b/bin/server.js
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-const enrichment = require("../main");
+const EnrichmentAddress = require("../main");
 const http = require("http");
 
 if (process.argv.length < 3 || !process.argv[2].match(/^[1-9][0-9]*$/)) {
@@ -9,6 +9,7 @@ if (process.argv.length < 3 || !process.argv[2].match(/^[1-9][0-9]*$/)) {
 }
 
 const port = parseInt(process.argv[2]);
+const enrichment = new EnrichmentAddress();
 
 const server = http.createServer((req, res) => {
   if (req.method === "GET") {
@@ -52,7 +53,7 @@ const server = http.createServer((req, res) => {
         return;
       }
     }
-    enrichment(input).then(json => {
+    enrichment.convert(input).then(json => {
       res.writeHead(200, {
         "Content-Type": "application/json",
         "Access-Control-Allow-Origin": "*"
@@ -72,3 +73,15 @@ const server = http.createServer((req, res) => {
 server.listen(port, () => {
   console.log(`imi-enrichment-address-server is running on port ${port}`);
 });
+
+server.on("close", () => {
+  enrichment.disconnect();
+});
+
+process.on("SIGINT", () => {
+  server.close();
+});
+
+process.on("SIGTERM", () => {
+  server.close();
+});
diff --git a/db/000005.ldb b/db/000005.ldb
diff --git a/db/000007.ldb b/db/000007.ldb
diff --git a/db/000009.ldb b/db/000009.ldb
diff --git a/db/000011.ldb b/db/000011.ldb
diff --git a/db/000013.ldb b/db/000013.ldb
diff --git a/db/000015.ldb b/db/000015.ldb
diff --git a/db/000017.ldb b/db/000017.ldb
diff --git a/db/000019.ldb b/db/000019.ldb
diff --git a/db/000021.ldb b/db/000021.ldb
diff --git a/db/000023.ldb b/db/000023.ldb
diff --git a/db/000025.ldb b/db/000025.ldb
diff --git a/db/000027.ldb b/db/000027.ldb
diff --git a/db/000029.ldb b/db/000029.ldb
diff --git a/db/000031.ldb b/db/000031.ldb
diff --git a/db/000034.ldb b/db/000034.ldb
diff --git a/db/000036.ldb b/db/000036.ldb
diff --git a/db/000038.ldb b/db/000038.ldb
diff --git a/db/000040.ldb b/db/000040.ldb
diff --git a/db/000042.ldb b/db/000042.ldb
diff --git a/db/000044.ldb b/db/000044.ldb
diff --git a/db/000046.ldb b/db/000046.ldb
diff --git a/db/000048.ldb b/db/000048.ldb
diff --git a/db/000050.ldb b/db/000050.ldb
diff --git a/db/000052.ldb b/db/000052.ldb
diff --git a/db/000054.ldb b/db/000054.ldb
diff --git a/db/000056.ldb b/db/000056.ldb
diff --git a/db/004710.ldb b/db/004710.ldb
diff --git a/db/CURRENT b/db/CURRENT
@@ -0,0 +1 @@
+MANIFEST-004708
diff --git a/db/LOG b/db/LOG
@@ -0,0 +1,6 @@
+2020/01/28-18:31:28.398952 7fe80f7e0700 Recovering log #4707
+2020/01/28-18:31:28.474353 7fe80f7e0700 Delete type=0 #4707
+2020/01/28-18:31:28.474570 7fe80f7e0700 Delete type=2 #4708
+2020/01/28-18:31:28.474796 7fe80f7e0700 Delete type=3 #4706
+2020/01/28-18:31:28.475150 7fe80efd0700 Compacting 1@0 + 1@1 files
+2020/01/28-18:31:28.476010 7fe80efd0700 compacted to: files[ 6 19 1 0 0 0 0 ]
diff --git a/db/LOG.old b/db/LOG.old
@@ -0,0 +1,6 @@
+2020/01/28-18:31:13.457455 7fe81d3a0700 Recovering log #4705
+2020/01/28-18:31:13.494892 7fe81d3a0700 Delete type=0 #4705
+2020/01/28-18:31:13.495105 7fe81d3a0700 Delete type=2 #4706
+2020/01/28-18:31:13.495302 7fe81d3a0700 Delete type=3 #4704
+2020/01/28-18:31:13.495725 7fe80efd0700 Compacting 1@0 + 1@1 files
+2020/01/28-18:31:13.497384 7fe80efd0700 compacted to: files[ 6 19 1 0 0 0 0 ]
diff --git a/db/MANIFEST-004708 b/db/MANIFEST-004708
diff --git a/lib/bangou.js b/lib/bangou.js
diff --git a/lib/find.js b/lib/find.js
@@ -45,7 +45,7 @@ const tree = (function(src) {
 
   return root;
 
-})(JSON.parse(require("fs").readFileSync(__dirname + "/../cache/tree.json", "UTF-8")));
+})(require('./tree.json'));
 
 
 // 1. 市区町村の特定