...

lib/installers/sysadmintools/grafana/grafana_actions.v

@@ -5,18 +5,18 @@ import freeflowuniverse.herolib.ui.console
 import freeflowuniverse.herolib.core.texttools
 import freeflowuniverse.herolib.core.pathlib
 import freeflowuniverse.herolib.osal.systemd
-import freeflowuniverse.herolib.osal.zinit
+import freeflowuniverse.herolib.osal.startupmanager
 import freeflowuniverse.herolib.installers.ulist
 import freeflowuniverse.herolib.installers.lang.golang
 import freeflowuniverse.herolib.installers.lang.rust
 import freeflowuniverse.herolib.installers.lang.python
 import os
 
-fn startupcmd() ![]zinit.ZProcessNewArgs {
+fn startupcmd() ![]startupmanager.ZProcessNewArgs {
 	mut installer := get()!
-	mut res := []zinit.ZProcessNewArgs{}
+	mut res := []startupmanager.ZProcessNewArgs{}
 	// THIS IS EXAMPLE CODEAND NEEDS TO BE CHANGED
-	// res << zinit.ZProcessNewArgs{
+	// res << startupmanager.ZProcessNewArgs{
 	//     name: 'grafana'
 	//     cmd: 'grafana server'
 	//     env: {

lib/installers/sysadmintools/grafana/grafana_factory_.v

@@ -2,28 +2,34 @@ module grafana
 
 import freeflowuniverse.herolib.core.playbook { PlayBook }
 import freeflowuniverse.herolib.ui.console
+import json
 import freeflowuniverse.herolib.osal.startupmanager
-import freeflowuniverse.herolib.osal.zinit
 import time
 
-__global (
-	grafana_global  map[string]&Grafana
-	grafana_default string
-)
-
 /////////FACTORY
 
 @[params]
 pub struct ArgsGet {
 pub mut:
-	name string
+	name string = 'default'
 }
 
-pub fn get(args_ ArgsGet) !&Grafana {
+pub fn new(args ArgsGet) !&Grafana {
 	return &Grafana{}
 }
 
+pub fn get(args ArgsGet) !&Grafana {
+	return new(args)!
+}
+
 pub fn play(mut plbook PlayBook) ! {
+	if !plbook.exists(filter: 'grafana.') {
+		return
+	}
+	mut install_actions := plbook.find(filter: 'grafana.configure')!
+	if install_actions.len > 0 {
+		return error("can't configure grafana, because no configuration allowed for this installer.")
+	}
 	mut other_actions := plbook.find(filter: 'grafana.')!
 	for other_action in other_actions {
 		if other_action.name in ['destroy', 'install', 'build'] {
@@ -64,30 +70,33 @@ pub fn play(mut plbook PlayBook) ! {
 //////////////////////////# LIVE CYCLE MANAGEMENT FOR INSTALLERS ///////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-fn startupmanager_get(cat zinit.StartupManagerType) !startupmanager.StartupManager {
+fn startupmanager_get(cat startupmanager.StartupManagerType) !startupmanager.StartupManager {
 	// unknown
 	// screen
 	// zinit
 	// tmux
 	// systemd
 	match cat {
+		.screen {
+			console.print_debug('startupmanager: zinit')
+			return startupmanager.get(.screen)!
+		}
 		.zinit {
 			console.print_debug('startupmanager: zinit')
-			return startupmanager.get(cat: .zinit)!
+			return startupmanager.get(.zinit)!
 		}
 		.systemd {
 			console.print_debug('startupmanager: systemd')
-			return startupmanager.get(cat: .systemd)!
+			return startupmanager.get(.systemd)!
 		}
 		else {
 			console.print_debug('startupmanager: auto')
-			return startupmanager.get()!
+			return startupmanager.get(.auto)!
 		}
 	}
 }
 
 pub fn (mut self Grafana) start() ! {
-	switch(self.name)
 	if self.running()! {
 		return
 	}
@@ -150,10 +159,12 @@ pub fn (mut self Grafana) running() !bool {
 
 	// walk over the generic processes, if not running return
 	for zprocess in startupcmd()! {
-		mut sm := startupmanager_get(zprocess.startuptype)!
-		r := sm.running(zprocess.name)!
-		if r == false {
-			return false
+		if zprocess.startuptype != .screen {
+			mut sm := startupmanager_get(zprocess.startuptype)!
+			r := sm.running(zprocess.name)!
+			if r == false {
+				return false
+			}
 		}
 	}
 	return running()!
@@ -185,12 +196,4 @@ pub fn (mut self Grafana) destroy() ! {
 
 // switch instance to be used for grafana
 pub fn switch(name string) {
-	grafana_default = name
-}
-
-// helpers
-
-@[params]
-pub struct DefaultConfigArgs {
-	instance string = 'default'
 }