Commit fa047c63 authored by Mikhail Karpenko's avatar Mikhail Karpenko
parents ee9032de cc03212a
...@@ -77,31 +77,33 @@ $default_state = "/home/root/camogm.disk"; ...@@ -77,31 +77,33 @@ $default_state = "/home/root/camogm.disk";
$state_file = "/mnt/sda1/camogm.disk"; $state_file = "/mnt/sda1/camogm.disk";
$start_str = "camogm -n " . $cmd_pipe . " -p " . $cmd_port; $start_str = "camogm -n " . $cmd_pipe . " -p " . $cmd_port;
if ($cmd == "run_camogm") function check_camogm_running(){
{ global $start_str;
$camogm_running = false; $camogm_running = false;
exec('ps | grep "camogm"', $arr); exec('ps | grep "camogm"', $arr);
function low_daemon($v) $check = implode("<br/>",$arr);
{
return (substr($v, -1) != ']'); if (strstr($check, $start_str)){
$camogm_running = true;
} }
$p = (array_filter($arr, "low_daemon")); return $camogm_running;
$check = implode("<br />",$p); }
//$state_file = get_state_path(); if ($cmd == "run_camogm")
{
if (isset($_GET['state_file'])){ if (isset($_GET['state_file'])){
$state_file = $_GET['state_file']; $state_file = $_GET['state_file'];
} }
$start_str = $start_str . " -s " . $state_file; if(!check_camogm_running()) {
if (strstr($check, $start_str)) echo "camogm is not running, starting\n";
$camogm_running = true;
else $start_str = $start_str . " -s " . $state_file;
$camogm_running = false;
if(!$camogm_running) { // clean
exec("rm " . $cmd_pipe); exec("rm " . $cmd_pipe);
exec("rm " . $cmd_state); exec("rm " . $cmd_state);
...@@ -130,28 +132,16 @@ if ($cmd == "run_camogm") ...@@ -130,28 +132,16 @@ if ($cmd == "run_camogm")
$cmd_str = 'format=mov;save_gp=1;'; $cmd_str = 'format=mov;save_gp=1;';
write_cmd_pipe($cmd_str); write_cmd_pipe($cmd_str);
} }
}else{
echo "camogm is running\n";
} }
} }
else if ($cmd == "status") else if ($cmd == "status")
{ {
// is camogm running if (check_camogm_running()) $camogm_running = "on";
$camogm_running = "not running"; else $camogm_running = "off";
exec('ps | grep "camogm"', $arr);
function low_daemon($v)
{
return (substr($v, -1) != ']');
}
$p = (array_filter($arr, "low_daemon"));
$check = implode("<br />",$p);
if (strstr($check, $start_str))
$camogm_running = "on";
else
$camogm_running = "off";
if ($camogm_running=="on"){ if ($camogm_running){
$pipe="/var/state/camogm.state"; $pipe="/var/state/camogm.state";
$mode=0777; $mode=0777;
if(!file_exists($pipe)) { if(!file_exists($pipe)) {
...@@ -174,23 +164,9 @@ else if ($cmd == "status") ...@@ -174,23 +164,9 @@ else if ($cmd == "status")
} }
else if ($cmd == "run_status") else if ($cmd == "run_status")
{ {
// is camogm running
$camogm_running = "not running";
exec('ps | grep "camogm"', $arr);
function low_daemon($v)
{
return (substr($v, -1) != ']');
}
$p = (array_filter($arr, "low_daemon"));
$check = implode("<br />",$p);
if (strstr($check, $start_str))
$camogm_running = "on";
else
$camogm_running = "off";
if (check_camogm_running()) $camogm_running = "on";
else $camogm_running = "off";
$status="<?xml version='1.0'?><camogm_state>\n<state>".$camogm_running."</state>\n</camogm_state>"; $status="<?xml version='1.0'?><camogm_state>\n<state>".$camogm_running."</state>\n</camogm_state>";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment