diff --git a/examples/installers/net/mycelium.vsh b/examples/installers/net/mycelium.vsh index 7c17b0fb..e2101c32 100755 --- a/examples/installers/net/mycelium.vsh +++ b/examples/installers/net/mycelium.vsh @@ -1,4 +1,4 @@ -#!/usr/bin/env -S v -n -w -gc none -cc tcc -d use_openssl -enable-globals run +#!/usr/bin/env -S v -n -w -cg -gc none -cc tcc -d use_openssl -enable-globals run import freeflowuniverse.herolib.installers.net.mycelium_installer import freeflowuniverse.herolib.clients.mycelium @@ -8,7 +8,7 @@ println(installer) installer.start()! -// $dbg; +$dbg; mut r := mycelium.inspect()! println(r) diff --git a/lib/clients/zinit/zinit.v b/lib/clients/zinit/zinit.v index 5ab01b8c..dcd885a3 100644 --- a/lib/clients/zinit/zinit.v +++ b/lib/clients/zinit/zinit.v @@ -101,7 +101,10 @@ pub fn (mut c ZinitRPC) service_create(name string, config ServiceConfig) !strin name: name content: config } + println(params) + $dbg; request := jsonrpc.new_request_generic('service_create', params) + $dbg; return client.send[ServiceCreateParams, string](request)! } diff --git a/lib/core/generator/generic/templates/objname_factory_.vtemplate b/lib/core/generator/generic/templates/objname_factory_.vtemplate index 54470440..3c070a1a 100644 --- a/lib/core/generator/generic/templates/objname_factory_.vtemplate +++ b/lib/core/generator/generic/templates/objname_factory_.vtemplate @@ -218,7 +218,7 @@ fn startupmanager_get(cat startupmanager.StartupManagerType) !startupmanager.Sta // systemd match cat{ .screen { - console.print_debug("startupmanager: zinit") + console.print_debug("startupmanager: screen") return startupmanager.get(.screen)! } .zinit{ diff --git a/lib/installers/net/mycelium_installer/mycelium_installer_factory_.v b/lib/installers/net/mycelium_installer/mycelium_installer_factory_.v index d7773037..e6d09fa0 100644 --- a/lib/installers/net/mycelium_installer/mycelium_installer_factory_.v +++ b/lib/installers/net/mycelium_installer/mycelium_installer_factory_.v @@ -178,7 +178,7 @@ fn startupmanager_get(cat startupmanager.StartupManagerType) !startupmanager.Sta // systemd match cat { .screen { - console.print_debug('startupmanager: zinit') + console.print_debug('startupmanager: screen') return startupmanager.get(.screen)! } .zinit { @@ -218,7 +218,10 @@ pub fn (mut self MyceliumInstaller) start() ! { start_pre()! + + for zprocess in startupcmd()! { + mut sm := startupmanager_get(zprocess.startuptype)! console.print_debug('starting mycelium_installer with ${zprocess.startuptype}...') @@ -226,6 +229,7 @@ pub fn (mut self MyceliumInstaller) start() ! { sm.new(zprocess)! sm.start(zprocess.name)! + } start_post()! diff --git a/lib/osal/startupmanager/startupmanager.v b/lib/osal/startupmanager/startupmanager.v index 87ac82f7..558b6ac1 100644 --- a/lib/osal/startupmanager/startupmanager.v +++ b/lib/osal/startupmanager/startupmanager.v @@ -111,6 +111,7 @@ pub fn (mut sm StartupManager) new(args ZProcessNewArgs) ! { } pub fn (mut sm StartupManager) start(name string) ! { + $dbg; match sm.cat { .screen { return