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

Made Dashboard compatible with new MMDVMHost-logformat

Browse source
This commit is contained in:
Kim Hübel 2019-12-09 19:07:47 +00:00
parent 2e550716e0
commit 61a5524731
4 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
database/callsigns.db
View file

Binary file not shown.

16
include/functions.php
View file

@ -163,6 +163,7 @@ function getDMRId ($mmdvmconfigs) {
// returns DMRId from MMDVM-Config
return getConfigItem("General", "Id", $mmdvmconfigs);
}
function getConfigItem($section, $key, $configs) {
// retrieves the corresponding config-entry within a [section]
$sectionpos = array_search("[" . $section . "]", $configs) + 1;
@ -226,14 +227,16 @@ function showMode($mode, $mmdvmconfigs) {
function getMMDVMLog() {
// Open Logfile and copy loglines into LogLines-Array()
$logPath = MMDVMLOGPATH."/".MMDVMLOGPREFIX."-".date("Y-m-d").".log";
$logLines = explode("\n", `egrep -h "from|end|watchdog|lost" $logPath`);
// $logLines = explode("\n", `egrep -h "from|end|watchdog|lost" $logPath`);
$logLines = explode("\n", `egrep -h "end|watchdog|lost" $logPath`);
return $logLines;
}
function getShortMMDVMLog() {
// Open Logfile and copy loglines into LogLines-Array()
$logPath = MMDVMLOGPATH."/".MMDVMLOGPREFIX."-".date("Y-m-d").".log";
$logLines = explode("\n", `egrep -h "from|end|watchdog|lost|Alias|0000" $logPath | grep -v "data header" | tail -20`);
//$logLines = explode("\n", `egrep -h "from|end|watchdog|lost|Alias|0000" $logPath | grep -v "data header" | tail -20`);
$logLines = explode("\n", `egrep -h "from|end|watchdog|lost" $logPath | sed '/\(CSBK\|overflow\|Downlink\)/d' | tail -20`);
return $logLines;
}
@ -249,6 +252,7 @@ function getYSFGatewayLog() {
// M: 2016-04-29 00:15:00.013 D-Star, received network header from DG9VH /ZEIT to CQCQCQ via DCS002 S
// M: 2016-04-29 19:43:21.839 DMR Slot 2, received network voice header from DL1ESZ to TG 9
// M: 2016-04-30 14:57:43.072 DMR Slot 2, received RF voice header from DG9VH to 5000
// M: 2019-12-09 18:56:46.947 DMR Slot 1, received RF voice header from 2625094 to TG 26266
// M: 2016-09-16 09:14:12.886 P25, received RF from DF2ET to TG10100
// M: 2017-02-13 15:53:30.990 DMR Slot 2, Embedded Talker Alias Header
// M: 2017-02-13 15:53:30.991 0000: 04 00 5E 49 57 38 44 59 94 *..^IW8DY.*
@ -468,8 +472,9 @@ function getHeardList($logLines, $onlyLast) {
$id="";
}
$target = substr($logLine, $topos + 3);
if (strpos($target,",") > 0)
$target = substr($target, 0, strpos($target,","));
$target = preg_replace('/\s/', ' ', $target);
if (defined("RESOLVETGS")) {
$target = $target." ".getTGName($target);
@ -693,6 +698,7 @@ function getActualLink($logLines, $mode) {
$to = "";
if (strpos($logLine,"to")) {
$to = trim(substr($logLine, strpos($logLine,"to") + 3));
$to = substr($to, 0, strpos($to,","));
}
if ($to !== "") {
$fp = fopen('/tmp/DMR1State.txt', 'w');
@ -723,6 +729,9 @@ function getActualLink($logLines, $mode) {
$to = "";
if (strpos($logLine,"to")) {
$to = trim(substr($logLine, strpos($logLine,"to") + 3));
$to = trim(substr($logLine, strpos($logLine,"to") + 3));
$to = substr($to, 0, strpos($to,","));
}
if ($to !== "") {
$fp = fopen('/tmp/DMR2State.txt', 'w');
@ -753,7 +762,6 @@ function getActualLink($logLines, $mode) {
//M: 2018-06-04 11:04:22.202 No connection startup
//M: 2018-06-04 11:04:24.005 Linked to IT C4FM Piemonte
if (isProcessRunning("YSFGateway")) {
foreach($logLines as $logLine) {
$to = "";

3
txinfo.php
View file

@ -14,6 +14,9 @@ if (!defined("MMDVMLOGPREFIX"))
if (!defined("TIMEZONE"))
define("TIMEZONE", "UTC");
$logLinesMMDVM = getShortMMDVMLog();
echo"<!--";
var_dump($logLinesMMDVM);
echo"-->";
$reverseLogLinesMMDVM = $logLinesMMDVM;
array_multisort($reverseLogLinesMMDVM,SORT_DESC);
$lastHeard = getLastHeard($reverseLogLinesMMDVM, True);

2
version.php
View file

@ -1,3 +1,3 @@
<?php
define("VERSION", "20180604-1 (".getGitVersion().")");
define("VERSION", "20191209-1 (".getGitVersion().")");
?>