pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(network): Use local logger

Browse Source
This commit is contained in:
Michael Carlberg 2016-06-21 07:49:15 +02:00
parent e4c457dcc7
commit fd88c60b97
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/modules/network.hpp
View File

@ -38,6 +38,8 @@ namespace modules
std::unique_ptr<drawtypes::Label> label_packetloss; std::unique_ptr<drawtypes::Label> label_packetloss;
std::unique_ptr<drawtypes::Label> label_packetloss_tokenized; std::unique_ptr<drawtypes::Label> label_packetloss_tokenized;
std::shared_ptr<Logger> logger;
std::string interface; std::string interface;
concurrency::Atomic<bool> connected; concurrency::Atomic<bool> connected;

17
src/modules/network.cpp
View File

@ -2,7 +2,6 @@
#include "lemonbuddy.hpp" #include "lemonbuddy.hpp"
#include "modules/network.hpp" #include "modules/network.hpp"
#include "services/logger.hpp"
#include "utils/config.hpp" #include "utils/config.hpp"
#include "utils/io.hpp" #include "utils/io.hpp"
#include "utils/proc.hpp" #include "utils/proc.hpp"
@ -11,8 +10,10 @@ using namespace modules;
// TODO: Add up-/download speed (check how ifconfig read the bytes) // TODO: Add up-/download speed (check how ifconfig read the bytes)
NetworkModule::NetworkModule(std::string name_) NetworkModule::NetworkModule(std::string name_) : TimerModule(name_, 1s)
: TimerModule(name_, 1s), connected(false), conseq_packetloss(false) , logger(get_logger())
, connected(false)
, conseq_packetloss(false)
{ {
static const auto DEFAULT_FORMAT_CONNECTED = TAG_LABEL_CONNECTED; static const auto DEFAULT_FORMAT_CONNECTED = TAG_LABEL_CONNECTED;
static const auto DEFAULT_FORMAT_DISCONNECTED = TAG_LABEL_DISCONNECTED; static const auto DEFAULT_FORMAT_DISCONNECTED = TAG_LABEL_DISCONNECTED;
@ -61,7 +62,7 @@ NetworkModule::NetworkModule(std::string name_)
this->wired_network = std::make_unique<net::WiredNetwork>(this->interface); this->wired_network = std::make_unique<net::WiredNetwork>(this->interface);
} }
} catch (net::NetworkException &e) { } catch (net::NetworkException &e) {
get_logger()->fatal(e.what()); this->logger->fatal(e.what());
} }
} }
@ -85,10 +86,10 @@ void NetworkModule::subthread_routine()
if (this->connected && this->conseq_packetloss) if (this->connected && this->conseq_packetloss)
this->broadcast(); this->broadcast();
std::this_thread::sleep_for(dur); this->sleep(dur);
} }
log_debug("Reached end of network subthread"); log_trace("Reached end of network subthread");
} }
bool NetworkModule::update() bool NetworkModule::update()
@ -106,7 +107,7 @@ bool NetworkModule::update()
essid = this->wireless_network->get_essid(); essid = this->wireless_network->get_essid();
signal_quality = this->wireless_network->get_signal_quality(); signal_quality = this->wireless_network->get_signal_quality();
} catch (net::WirelessNetworkException &e) { } catch (net::WirelessNetworkException &e) {
get_logger()->debug(e.what()); this->logger->debug(e.what());
} }
this->signal_quality = signal_quality; this->signal_quality = signal_quality;
@ -121,7 +122,7 @@ bool NetworkModule::update()
try { try {
ip = network->get_ip(); ip = network->get_ip();
} catch (net::NetworkException &e) { } catch (net::NetworkException &e) {
get_logger()->debug(e.what()); this->logger->debug(e.what());
} }
this->connected = network->connected(); this->connected = network->connected();