move qnlink init order & filter out journal from PS dash option

pull/14/head
Tom Early 6 years ago
parent eeb806ffc5
commit 0f6f764e86

@ -3288,7 +3288,6 @@ bool CQnetLink::Init(const char *cfgfile)
if (qnDB.Open(fname.c_str())) if (qnDB.Open(fname.c_str()))
return true; return true;
qnDB.ClearLS(); qnDB.ClearLS();
LoadGateways(gwys);
/* create our server */ /* create our server */
if (!srv_open()) { if (!srv_open()) {
@ -3296,6 +3295,8 @@ bool CQnetLink::Init(const char *cfgfile)
return true; return true;
} }
LoadGateways(gwys);
std::string index(announce_dir); std::string index(announce_dir);
index.append("/index.dat"); index.append("/index.dat");
std::ifstream indexfile(index.c_str(), std::ifstream::in); std::ifstream indexfile(index.c_str(), std::ifstream::in);

@ -114,7 +114,7 @@ foreach($showlist as $section) {
if (`ps -aux | grep -e qn -e MMDVMHost | wc -l` > 2) { if (`ps -aux | grep -e qn -e MMDVMHost | wc -l` > 2) {
echo 'Processes:<br><code>', "\n"; echo 'Processes:<br><code>', "\n";
echo str_replace(' ', '&nbsp;', 'USER PID %CPU %MEM VSZ RSS TTY STAT START TIME COMMAND<br>'), "\n"; echo str_replace(' ', '&nbsp;', 'USER PID %CPU %MEM VSZ RSS TTY STAT START TIME COMMAND<br>'), "\n";
$lines = explode("\n", `ps -aux | grep -e qngateway -e qnlink -e qndtmf -e qndvap -e qnitap -e qnrelay -e qndvrptr -e qnmodem -e MMDVMHost | grep -v grep`); $lines = explode("\n", `ps -aux | grep -e qngateway -e qnlink -e qndtmf -e qndvap -e qnitap -e qnrelay -e qndvrptr -e qnmodem -e MMDVMHost | grep -v -e grep -e journal`);
foreach ($lines as $line) { foreach ($lines as $line) {
echo str_replace(' ', '&nbsp;', $line), "<br>\n"; echo str_replace(' ', '&nbsp;', $line), "<br>\n";
} }
@ -254,6 +254,6 @@ foreach($showlist as $section) {
} }
?> ?>
<br> <br>
<p align="right">QnetGateway Dashboard Version 2.1 Copyright &copy; by Thomas A. Early, N7TAE.</p> <p align="right">QnetGateway Dashboard Version 525 Copyright &copy; by Thomas A. Early, N7TAE.</p>
</body> </body>
</html> </html>

Loading…
Cancel
Save

Powered by TurnKey Linux.