software/helloworld: Switch to monitor-promise-base

software/helloworld/buildout.hash.cfg

@@ -14,4 +14,4 @@
 # not need these here).
 [instance-profile]
 filename = instance.cfg.in
-md5sum = 6567f8dedb5cdd93542dc29e96edb547
+md5sum = cc8902e44c1d50804b570775633b8c2a

software/helloworld/instance.cfg.in

@@ -15,6 +15,7 @@ eggs-directory = {{ buildout['eggs-directory'] }}
 develop-eggs-directory = {{ buildout['develop-eggs-directory'] }}
 offline = true
 
+extends = {{ template_monitor }}
 
 [instance-parameter]
 # Fetch arbitrary parameters defined by the user in SlapOS Master for his instance.
@@ -51,9 +52,6 @@ var = ${:home}/var
 script = ${:etc}/run/
 # Executables put here will be started and monitored (for daemons)
 service = ${:etc}/service
-# Executables put here will be launched after buildout has completed to see
-# if instance is running
-promise = ${:etc}/promise/
 # Path of the log directory used by our service (see [helloweb])
 log = ${:var}/log
 
@@ -88,8 +86,9 @@ wrapper-path = ${directory:service}/helloweb-${:kind}
 
 # promise, that checks that helloweb service is alive
 [helloweb-promise]
-recipe = slapos.cookbook:check_port_listening
-path = ${directory:promise}/helloweb-${:kind}
+<= monitor-promise-base
+module = check_port_listening
+name = helloweb-${:kind}.py
 
 {# macro to instantiate service of `kind` to listen on `port` #}
 {% set service_list = [] %}
@@ -103,8 +102,8 @@ port    = {{ port }}
 [helloweb-{{ kind }}-promise]
 <= helloweb-promise
 kind    = {{ kind }}
-hostname= ${helloweb-{{ kind }}:ipv6}
-port    = {{ port }}
+config-hostname= ${helloweb-{{ kind }}:ipv6}
+config-port    = {{ port }}
 {% endmacro %}
 
 # services instantiation

software/helloworld/software.cfg

@@ -7,6 +7,7 @@ extends =
 # "slapos" stack describes basic things needed for 99.9% of SlapOS Software
 # Releases
   ../../stack/slapos.cfg
+  ../../stack/monitor/buildout.cfg
 # Extend here component profiles, like openssl, apache, mariadb, curl...
 # Or/and extend a stack (lamp, tomcat) that does most of the work for you
 # In this example we extend from helloweb component.
@@ -46,6 +47,7 @@ rendered = ${buildout:directory}/instance.cfg
 extensions = jinja2.ext.do
 context =
   section buildout  buildout
+  raw template_monitor ${monitor2-template:rendered}
 # md5sum is fetched from buildout.hash.cfg and can be recalculated automatically by
 # calling update-hash