scottk/wlan-cloud-owprov
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-owprov.git synced 2025-11-01 19:17:47 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Changing to a timer from a thread for DeviceType updates.

Browse Source
This commit is contained in:
stephb9959
2022-02-09 13:44:09 -08:00
parent c59077da29
commit 46bb1a208d
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/AutoDiscovery.cpp
View File

@@ -24,8 +24,6 @@ namespace OpenWifi {
Worker_.join(); Worker_.join();
}; };
#define __DBG__ std::cout << __FILE__ << ": " << __LINE__ << std::endl;
void AutoDiscovery::run() { void AutoDiscovery::run() {
Poco::AutoPtr<Poco::Notification> Note(Queue_.waitDequeueNotification()); Poco::AutoPtr<Poco::Notification> Note(Queue_.waitDequeueNotification());
while(Note && Running_) { while(Note && Running_) {

7
src/storage/storage_inventory.cpp
View File

@@ -99,6 +99,7 @@ namespace OpenWifi {
StateDoc["method"] = "auto-discovery"; StateDoc["method"] = "auto-discovery";
StateDoc["date"] = std::time(nullptr); StateDoc["date"] = std::time(nullptr);
NewDevice.state = to_string(StateDoc); NewDevice.state = to_string(StateDoc);
NewDevice.devClass = "any";
if(!IP.empty()) { if(!IP.empty()) {
StorageService()->VenueDB().GetByIP(IP,NewDevice.venue); StorageService()->VenueDB().GetByIP(IP,NewDevice.venue);
if(NewDevice.venue.empty()) { if(NewDevice.venue.empty()) {
@@ -150,14 +151,18 @@ namespace OpenWifi {
if((Now - Date)<(24*60*60)) { if((Now - Date)<(24*60*60)) {
State["method"] = "claimed"; State["method"] = "claimed";
State["date"] = std::time(nullptr); State["date"] = std::time(nullptr);
ExistingDevice.state = State; ExistingDevice.state = to_string(State);
modified = true; modified = true;
} else { } else {
ExistingDevice.state = ""; ExistingDevice.state = "";
modified = true; modified = true;
} }
} }
} else {
ExistingDevice.devClass = "any";
modified = true;
} }
if(modified) { if(modified) {
ExistingDevice.info.modified = std::time(nullptr); ExistingDevice.info.modified = std::time(nullptr);
StorageService()->InventoryDB().UpdateRecord("serialNumber", SerialNumber, ExistingDevice); StorageService()->InventoryDB().UpdateRecord("serialNumber", SerialNumber, ExistingDevice);