klaute/MMDVMHost-Dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Speedup functions with grep and egrep

Browse source
This commit is contained in:
CT2JAY 2017-02-28 00:03:41 +00:00
parent 8703dc047b
commit 4c97933d5a
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
include/functions.php
View file

@ -24,7 +24,7 @@ function getMMDVMHostFileVersion() {
function getFirmwareVersion() { function getFirmwareVersion() {
$logPath = MMDVMLOGPATH."/".MMDVMLOGPREFIX."-".date("Y-m-d").".log"; $logPath = MMDVMLOGPATH."/".MMDVMLOGPREFIX."-".date("Y-m-d").".log";
$logLines = explode("\n", `grep "MMDVM protocol version" $logPath`); $logLines = explode("\n", `LC_ALL=C egrep "MMDVM protocol version" $logPath`);
$firmware = "n/a"; $firmware = "n/a";
if (count($logLines) >= 2) { if (count($logLines) >= 2) {
$firmware = substr($logLines[count($logLines)-2], strpos($logLines[count($logLines)-2], "description")+13, strlen($logLines[count($logLines)-2])-strpos($logLines[count($logLines)-2], "description")+13); $firmware = substr($logLines[count($logLines)-2], strpos($logLines[count($logLines)-2], "description")+13, strlen($logLines[count($logLines)-2])-strpos($logLines[count($logLines)-2], "description")+13);
@ -72,7 +72,7 @@ function getDMRNetwork2() {
function getDMRMasterState() { function getDMRMasterState() {
$logPath = MMDVMLOGPATH."/".MMDVMLOGPREFIX."-".date("Y-m-d").".log"; $logPath = MMDVMLOGPATH."/".MMDVMLOGPREFIX."-".date("Y-m-d").".log";
$logLines = explode("\n", `egrep -h "(DMR, Logged into the master successfully)|(DMR, Closing DMR Network)" $logPath`); $logLines = explode("\n", `LC_ALL=C egrep -h "(DMR, Logged into the master successfully)|(DMR, Closing DMR Network)" $logPath`);
$state = -1; $state = -1;
foreach($logLines as $logLine) { foreach($logLines as $logLine) {
if (strpos($logLine, "successfully") > 0) { if (strpos($logLine, "successfully") > 0) {
@ -189,14 +189,14 @@ function getMMDVMLog() {
// Open Logfile and copy loglines into LogLines-Array() // Open Logfile and copy loglines into LogLines-Array()
$logPath = MMDVMLOGPATH."/".MMDVMLOGPREFIX."-".date("Y-m-d").".log"; $logPath = MMDVMLOGPATH."/".MMDVMLOGPREFIX."-".date("Y-m-d").".log";
//$logLines = explode("\n", `grep M: $logPath`); //$logLines = explode("\n", `grep M: $logPath`);
$logLines = explode("\n", `egrep -h "from|end|watchdog|lost" $logPath`); $logLines = explode("\n", `LC_ALL=C egrep -h "from|end|watchdog|lost" $logPath`);
return $logLines; return $logLines;
} }
function getShortMMDVMLog() { function getShortMMDVMLog() {
// Open Logfile and copy loglines into LogLines-Array() // Open Logfile and copy loglines into LogLines-Array()
$logPath = MMDVMLOGPATH."/".MMDVMLOGPREFIX."-".date("Y-m-d").".log"; $logPath = MMDVMLOGPATH."/".MMDVMLOGPREFIX."-".date("Y-m-d").".log";
$logLines = explode("\n", `egrep -h "from|end|watchdog|lost|Alias|0000" $logPath | tail -20`); $logLines = explode("\n", `LC_ALL=C egrep -h "from|end|watchdog|lost|Alias|0000" $logPath | tail -20`);
return $logLines; return $logLines;
} }
@ -204,7 +204,7 @@ function getYSFGatewayLog() {
// Open Logfile and copy loglines into LogLines-Array() // Open Logfile and copy loglines into LogLines-Array()
$logPath = YSFGATEWAYLOGPATH."/".YSFGATEWAYLOGPREFIX."-".date("Y-m-d").".log"; $logPath = YSFGATEWAYLOGPATH."/".YSFGATEWAYLOGPREFIX."-".date("Y-m-d").".log";
//$logLines = explode("\n", `egrep -h "D:|M:" $logPath`); //$logLines = explode("\n", `egrep -h "D:|M:" $logPath`);
$logLines = explode("\n", `egrep -h "Starting|DISCONNECT|Connect|Automatic" $logPath`); $logLines = explode("\n", `LC_ALL=C egrep -h "Starting|DISCONNECT|Connect|Automatic" $logPath`);
return $logLines; return $logLines;
} }
@ -787,10 +787,12 @@ function getName($callsign) {
$callsign = substr($callsign,0,strpos($callsign,"-")); $callsign = substr($callsign,0,strpos($callsign,"-"));
} }
$delimiter =" "; $delimiter =" ";
exec("grep -P '".$callsign.$delimiter."' ".DMRIDDATPATH, $output); // exec("grep -P '".$callsign.$delimiter."' ".DMRIDDATPATH, $output);
if (count($output) == 0) { exec("LC_ALL=C egrep -m1 '".$callsign.$delimiter."' ".DMRIDDATPATH, $output);
if (count($output) == 0) {
$delimiter = "\t"; $delimiter = "\t";
exec("grep -P '".$callsign.$delimiter."' ".DMRIDDATPATH, $output); // exec("grep -P '".$callsign.$delimiter."' ".DMRIDDATPATH, $output);
exec("LC_ALL=C egrep -m1 '".$callsign.$delimiter."' ".DMRIDDATPATH, $output);
} }
if (count($output) !== 0) { if (count($output) !== 0) {
$name = substr($output[0], strpos($output[0],$delimiter)+1); $name = substr($output[0], strpos($output[0],$delimiter)+1);