software/theia: Add standalone ready promise

software/theia/buildout.hash.cfg

@@ -15,7 +15,7 @@
 
 [instance-theia]
 _update_hash_filename_ = instance-theia.cfg.jinja.in
-md5sum = 3e7364c6790ab176df90a8cf19715a43
+md5sum = 001440693adfb9583d1479aae4bfa970
 
 [instance]
 _update_hash_filename_ = instance.cfg.in

software/theia/instance-theia.cfg.jinja.in

@@ -74,6 +74,7 @@ instance-promises =
   $${remote-additional-frontend-url-available-promise:name}
   {% endif %}
   $${slapos-standalone-listen-promise:name}
+  $${slapos-standalone-ready-promise:name}
   $${slapos-autorun-promise:name}
 
 [theia-listen-promise]
@@ -124,10 +125,15 @@ name = standalone-listen-promise.py
 config-host = $${slapos-standalone-instance:hostname}
 config-port = $${slapos-standalone-instance:port}
 
+[slapos-standalone-ready-promise]
+<= monitor-promise-base
+module = check_socket_listening
+name = standalone-ready-promise.py
+config-abstract = $${directory:runner}/standalone_ready
+
 [slapos-autorun-promise]
 <= monitor-promise-base
 module = check_service_state
-# XXX promise plugins can not contain "slapos" in their names
 name = autorun-state-promise.py
 config-service = $${slapos-autorun:service-name}
 config-expect = $${slapos-autorun:autorun}

software/theia/software.cfg

@@ -58,9 +58,10 @@ initialization =
   import argparse
   import glob
   import json
-  import os.path
-  import sys
+  import os
   import signal
+  import socket
+  import sys
   import time
 
   import slapos.slap.standalone
@@ -106,7 +107,14 @@ initialization =
       partition_forward_configuration=partition_forward_configuration,
       slapos_bin="${buildout:bin-directory}/slapos",
   )
+
+  def signal_handler(signum, frame):
+    print("Signal {signum} received".format(signum=signum))
+    sys.exit()
+  signal.signal(signal.SIGTERM, signal_handler)
+
   standalone.start()
+  try:
     partition_count = 20
     if len(glob.glob(os.path.join(standalone.instance_directory, '*'))) < partition_count:
       print("Standalone SlapOS: Formatting {partition_count} partitions".format(
@@ -114,7 +122,7 @@ initialization =
       standalone.format(
           partition_count,
           args.ipv4,
-        args.ipv6
+          args.ipv6,
       )
     print("Standalone SlapOS for computer `{}` started".format(args.computer_id))
     # Run instance at least once, to start the supervisor managing instances.
@@ -143,20 +151,18 @@ initialization =
           partition_parameter_kw=params,
       )
 
-  quit_requested = []
-  def signal_handler(signum, frame):
-    print("Signal {signum} received".format(signum=signum))
-    quit_requested.append(True)
-  signal.signal(signal.SIGTERM, signal_handler)
-
+    s = socket.socket(socket.AF_UNIX)
+    s.bind('\0' + os.path.join(args.base_directory, 'standalone_ready'))
+    s.listen(5)
     print("Standalone SlapOS ready")
-  while not quit_requested:
-    time.sleep(.1)
+    while True:
+      s.accept()[0].close()
 
+  finally:
     print("Stopping standalone subsystem")
     standalone.stop()
     print("Exiting")
-  sys.exit(0)
+
 
 needs-these-eggs-scripts-in-path =
   ${supervisor:recipe}