Getting management (start/stop/restart) working

git-svn-id: svn://svn.alpinelinux.org/acf/alpine-baselayout/trunk@670 ab2d0c66-481e-0410-8bed-d214d4d58bed

3 files changed, 21 insertions, 18 deletions

diff --git a/syslog-config-html.lsp b/syslog-config-html.lsp
index 8284dc7..dc8fe5a 100644
--- a/syslog-config-html.lsp
+++ b/syslog-config-html.lsp
@@ -104,17 +104,10 @@ if (myform) and (myform[tags[1]]) then
 		<? end ?>
 		</dd>
 
-<? --[[ ?>
-		<? if (myform.cmd_save_result) then ?>
-		<? local temp ?>
-		<? for k,v in pairs(myform.cmd_save_result) ?>
-			<? temp = temp .. k ?>
-		<? end ?>
-		
+		<? if (form.cmdmanagement) and (#form.cmdmanagement.descr > 0) then ?>
 		<dt>Previous action result</dt>
-			<dd><pre><?= temp ?></pre></dd>
+			<dd><pre><?= form.cmdmanagement.descr ?></pre></dd>
 		<? end ?>
-<? --]] ?>
 	</dl>
 	</form>
 
diff --git a/syslog-controller.lua b/syslog-controller.lua
index 900856c..a32f103 100644
--- a/syslog-controller.lua
+++ b/syslog-controller.lua
@@ -28,10 +28,15 @@ function status(self)
 end
 
 function config(self)
+	local cmdmanagement
 	local cmd_save_result = {}
 	local cmderrors = {}
-	if ( self.clientdata.cmddaemon) then
-		startstop = self.model:startstop_service( self.clientdata.cmddaemon )
+	if ( self.clientdata.cmd_management) then
+		local cmd_management = cfe({ 
+			name="cmd_management", 
+			value=string.lower(self.clientdata.cmd_management),
+			})
+		cmdmanagement = self.model:startstop_service( cmd_management )
 	end
 	if ( self.clientdata.cmd_save) then
 		local variables="logfile loglevel smallerlogs maxsize numrotate localandnetworklog remotelogging"	-- Advanced-config options
@@ -61,17 +66,17 @@ function config(self)
 		})
 	-- Add a management buttons
 	management = {}
-	management.start = cfe({ name="start",
+	management.start = cfe({ name="cmd_management",
 		label="Program control-panel",
 		value="Start",
 		type="submit",
 		})
-	management.stop = cfe({ name="stop",
+	management.stop = cfe({ name="cmd_management",
 		label="Program control-panel",
 		value="Stop",
 		type="submit",
 		})
-	management.restart = cfe({ name="restart",
+	management.restart = cfe({ name="cmd_management",
 		label="Program control-panel",
 		value="Restart",
 		type="submit",
@@ -115,7 +120,7 @@ function config(self)
 			controller = self.conf.controller,
 			action = "config", },
 		status = status, 
-		startstop = startstop,
+		cmdmanagement = cmdmanagement,
 		clientdata = self.clientdata,
 		management = management,
 		config = config,
diff --git a/syslog-model.lua b/syslog-model.lua
index 0045b5b..f4b2681 100644
--- a/syslog-model.lua
+++ b/syslog-model.lua
@@ -28,8 +28,13 @@ end
 -- ################################################################################
 -- PUBLIC FUNCTIONS
 
-function startstop_service ( self, state )
-	return daemoncontrol.daemoncontrol("syslog", state)
+function startstop_service ( self, action )
+	local cmd = action.value
+	local cmdresult,cmdaction,cmdmessage,cmderror = daemoncontrol.daemoncontrol("syslog", cmd)
+	action.descr=cmdmessage
+	action.errtxt=cmderror
+	return action
+
 end
 
 function getstatus()
@@ -201,7 +206,7 @@ function setconfigs(self,variable,parameter,value)
 --	if (errorscmd) and (#errorscmd > 0) then
 	local errorscmd = cfe({ name="variable", errtxt=errorscmd, })
 --	end
-	return errorscmd
+	return true, e
 end
 
 function update_filecontent (self, modifications)