On-server tweaks

Signed-off-by: zyphlar <zyphlar@gmail.com>

tools/python/maps_generator/generator/exceptions.py

@@ -1,5 +1,5 @@
 import os
-
+import subprocess
 
 class MapsGeneratorError(Exception):
     pass
@@ -35,9 +35,24 @@ class FailedTest(MapsGeneratorError):
 
 def wait_and_raise_if_fail(p):
     if p.wait() != os.EX_OK:
-        args = p.args
-        logs = p.output.name
-        if p.error.name != logs:
-            logs += " and " + p.error.name
-        msg = f"The launch of {args.pop(0)} failed.\nArguments used: {' '.join(args)}\nSee details in {logs}"
-        raise BadExitStatusError(msg)
+        if type(p) is subprocess.Popen:
+            args = p.args
+            stdout = p.stdout
+            stderr = p.stderr
+            logs = None
+            errors = None
+            if type(stdout) is not type(None):
+              logs = stdout.read(256).decode()
+            if type(stderr) is not type(None):
+              errors = stderr.read(256).decode()
+            if errors != logs:
+                logs += " and " + errors
+            msg = f"The launch of {args.pop(0)} failed.\nArguments used: {' '.join(args)}\nSee details in {logs}"
+            raise BadExitStatusError(msg)
+        else:
+            args = p.args
+            logs = p.output.name
+            if p.error.name != logs:
+                logs += " and " + p.error.name
+            msg = f"The launch of {args.pop(0)} failed.\nArguments used: {' '.join(args)}\nSee details in {logs}"
+            raise BadExitStatusError(msg)

tools/python/maps_generator/generator/stages_tests.py

@@ -9,6 +9,8 @@ from maps_generator.utils.file import download_file
 
 def make_test_booking_data(max_days):
     def test_booking_data(env: Env, logger, *args, **kwargs):
+        if not settings.HOTELS_URL:
+            return None
         base_url, _ = settings.HOTELS_URL.rsplit("/", maxsplit=1)
         url = f"{base_url}/meta.json"
         meta_path = os.path.join(env.paths.tmp_dir(), "hotels-meta.json")

tools/python/maps_generator/var/etc/map_generator.ini.prod

@@ -56,7 +56,7 @@ PLANET_MD5_URL: ${External:PLANET_URL}.md5
 # then the https://somesite.com/download/latest_coasts.geom url will be used to download latest_coasts.geom and
 # the https://somesite.com/download/latest_coasts.rawgeom url will be used to download latest_coasts.rawgeom.
 # Comment to skip getting the coastlines files.
-PLANET_COASTS_URL: https://maps.zyphon.com/comaps
+PLANET_COASTS_URL: file:///home/planet/
 # Should be 'true' for an entire planet build to make a special routing section in World.mwm
 # for alerting about absent regions without which the route can't be built.
 NEED_BUILD_WORLD_ROADS: true