From e9a0c549227e06b1ac167b3e6a03f37b68a66bf7 Mon Sep 17 00:00:00 2001 From: Ren RenJuan Date: Sun, 19 Jan 2014 08:55:03 +0000 Subject: [PATCH] * --- APIG/client/commander.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/APIG/client/commander.cpp b/APIG/client/commander.cpp index 2342e5f..845965c 100644 --- a/APIG/client/commander.cpp +++ b/APIG/client/commander.cpp @@ -291,7 +291,7 @@ void mdCommander::driver() { clear(); continue; } - if (!strcmp(rawString,"tkvi")) { char *lastLog="./etc/donutsOTEConnectivity.log"; + if (!strcmp(rawString,"tkvi")) { char *lastLog="./logs/lastLog"; sprintf(wwork,"vim %s",lastLog); system(wwork); clear(); @@ -302,8 +302,9 @@ void mdCommander::driver() { } if (!strcmp(rawString,"quit")) { quit: thisConfig->terminateRequest = true; + if (thisConfig->daemonProcess > 2) { sprintf(work,"kill -9 %d",thisConfig->daemonProcess); - system(work); + system(work); } shm.remove("ausreg-cd-global"); sprintf(work,"rm /tmp/ausreg-cd.lock"); system(work); @@ -360,7 +361,7 @@ void mdCommander::help() { mvprintw(16,10," loG - cd UI log"); mvprintw(17,10," log - cd daemon log*"); mvprintw(18,10," mlog - master daemon log"); - mvprintw(19,10," tkvi - vim/xmledit last tk log (path hardcoded)"); + mvprintw(19,10," tkvi - xmledit ./logs/lastLog (last toolkit log)"); mvprintw(20,10," done - terminate commander but not process"); mvprintw(21,10," q/quit - end process tree, delete log files"); mvprintw(23,5," is an integer, above active everywhere outside data entry (>>)");