github-personal/sysadm
1
0
Fork 0
mirror of https://github.com/outbackdingo/sysadm.git synced 2026-01-27 10:20:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix up the timers in the event watcher. Due to the multi-threading, we need to create the timers in the start() function instead of the constructor.

Browse Source
This commit is contained in:
Ken Moore
2016-02-22 12:53:27 -05:00
parent a6c76fbaa1
commit 6640762196
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/server/EventWatcher.cpp
View File

@@ -11,7 +11,17 @@
// === PUBLIC ===
EventWatcher::EventWatcher(){
qRegisterMetaType<EventWatcher::EVENT_TYPE>("EventWatcher::EVENT_TYPE");
//Only put non-thread-specific stuff here
starting = true;
oldhostname = sysadm::General::RunCommand("hostname").simplified();
}
EventWatcher::~EventWatcher(){
}
void EventWatcher::start(){
//Make sure that any new timer/etc are setup here (multi-thread issues)
starting = true;
watcher = new QFileSystemWatcher(this);
filechecktimer = new QTimer(this);
@@ -20,24 +30,17 @@ EventWatcher::EventWatcher(){
connect(watcher, SIGNAL(fileChanged(const QString&)), this, SLOT(WatcherUpdate(const QString&)) );
connect(watcher, SIGNAL(directoryChanged(const QString&)), this, SLOT(WatcherUpdate(const QString&)) );
connect(filechecktimer, SIGNAL(timeout()), this, SLOT( CheckLogFiles()) );
oldhostname = sysadm::General::RunCommand("hostname").simplified();
syschecktimer = new QTimer(this);
syschecktimer->setSingleShot(false);
syschecktimer->setInterval(900000); //15 minute checks
connect(syschecktimer, SIGNAL(timeout()), this, SLOT( CheckSystemState()) );
}
EventWatcher::~EventWatcher(){
}
void EventWatcher::start(){
starting = true;
// - Life Preserver Events
WatcherUpdate(LPLOG); //load it initially (will also add it to the watcher);
WatcherUpdate(LPERRLOG); //load it initially (will also add it to the watcher);
filechecktimer->start();
syschecktimer->start();
QTimer::singleShot(0, this, SLOT(CheckSystemState()) );
starting = false;
}