Continue piscina try

datagouv · Apr 4, 2023 · 284d294 · 284d294
1 parent 8631b7c
commit 284d294
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 19 deletions.
diff --git a/lib/commands/generate-shp.js b/lib/commands/generate-shp.js
@@ -73,8 +73,6 @@ async function handler(workDir) {
 
   console.timeEnd('  terminé')
 
-  await stopWorkers()
-
   console.log()
   console.log('Finished!')
 }

diff --git a/lib/extract/departement.js b/lib/extract/departement.js
@@ -1,13 +1,10 @@
-import {createRequire} from 'node:module'
 import {EventEmitter} from 'node:events'
 import {Piscina} from 'piscina'
 import bluebird from 'bluebird'
 import {Tree} from '../dist/pci.js'
 
-const require = createRequire(import.meta.url)
-
 const extractCommuneWorkers = new Piscina({
-  filename: new URL('./worker.js', import.meta.url).href,
+  filename: new URL('worker.js', import.meta.url).href,
 })
 
 function extractDepartement(basePath, codeDep) {
@@ -28,15 +25,16 @@ function extractDepartement(basePath, codeDep) {
 
       // Series since GDAL is a blocking binding
       // eslint-disable-next-line unicorn/no-array-method-this-argument, unicorn/no-array-callback-reference
-      return bluebird.map(communesFound, commune => new Promise((resolve, reject) => {
+      return bluebird.map(communesFound, commune => {
         try {
-          await extractCommuneWorkers.run({basePath, codeCommune: commune})
           progress({codeCommune: commune})
+          return extractCommuneWorkers.run({basePath, codeCommune: commune})
         } catch (error) {
           console.error('Unable to extract commune %s', commune)
           console.error(error)
+          return Promise.reject(error)
         }
-      }))
+      })
     })
     .then(() => extractor.emit('end'))
     .catch(error => extractor.emit('error', error))

diff --git a/lib/merge/index.js b/lib/merge/index.js
@@ -1,9 +1,7 @@
-import {createRequire} from 'node:module'
-import os from 'node:os'
 import {Piscina} from 'piscina'
 
 const mergeWorkers = new Piscina({
-  filename: new URL('./worker.js', import.meta.url).href,
+  filename: new URL('worker.js', import.meta.url).href,
 })
 
 function mergeGeoJSONFiles(options) {

diff --git a/lib/shp/index.js b/lib/shp/index.js
@@ -1,13 +1,7 @@
-import os from 'node:os'
-import {createRequire} from 'node:module'
-import {promisify} from 'node:util'
 import {Piscina} from 'piscina'
 
-const require = createRequire(import.meta.url)
-const concurrency = Math.min(os.cpus().length, 8)
-
 const shpWorkers = new Piscina({
-  filename: new URL('./worker.js', import.meta.url).href,
+  filename: new URL('worker.js', import.meta.url).href,
 })
 
 function convertToShape(srcPath, destPath, {layer, targetCrs}) {