Merge remote-tracking branch 'upstream/master'

[nominatim.git] / nominatim / clicmd / add_data.py

diff --git a/nominatim/clicmd/add_data.py b/nominatim/clicmd/add_data.py
index 95e95b0a7da94a350ce32d2a0f6c62bb77817550..9f0d311898dbadbf54a6f77b1900735a3b5d532a 100644 (file)
--- a/nominatim/clicmd/add_data.py
+++ b/nominatim/clicmd/add_data.py
@@ -3,6 +3,8 @@ Implementation of the 'add-data' subcommand.
 """
 import logging
 
 """
 import logging
 

+import psutil
+

 # Do not repeat documentation of subcommand classes.
 # pylint: disable=C0111
 # Using non-top-level imports to avoid eventually unused imports.
 # Do not repeat documentation of subcommand classes.
 # pylint: disable=C0111
 # Using non-top-level imports to avoid eventually unused imports.


@@ -59,7 +61,8 @@ class UpdateAddData:
         if args.tiger_data:
             tokenizer = tokenizer_factory.get_tokenizer_for_db(args.config)
             return tiger_data.add_tiger_data(args.tiger_data,
         if args.tiger_data:
             tokenizer = tokenizer_factory.get_tokenizer_for_db(args.config)
             return tiger_data.add_tiger_data(args.tiger_data,

-                                             args.config, args.threads or 1,
+                                             args.config,
+                                             args.threads or psutil.cpu_count()  or 1,

                                              tokenizer)
 
         osm2pgsql_params = args.osm2pgsql_options(default_cache=1000, default_threads=1)
                                              tokenizer)
 
         osm2pgsql_params = args.osm2pgsql_options(default_cache=1000, default_threads=1)