From 9e36adef920329440b428f7abffa3a9b54bf58a3 Mon Sep 17 00:00:00 2001 From: bert hubert Date: Sat, 25 Jan 2020 22:41:34 +0100 Subject: [PATCH] fixed conflict --- galmonmon.cc | 154 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 105 insertions(+), 49 deletions(-) diff --git a/galmonmon.cc b/galmonmon.cc index 3a63c0d..177a6a1 100644 --- a/galmonmon.cc +++ b/galmonmon.cc @@ -161,8 +161,10 @@ static std::string string_replace(const std::string& str, const std::string& mat void sendTweet(const string& tweet) { - string etweet = string_replace(tweet, "+", "%2b"); - system((string("twurl -X POST \"/1.1/statuses/update.json?status=")+etweet+"\" >> twitter.log").c_str()); + string etweet = tweet; + //system((string("twurl -X POST /1.1/statuses/update.json -d \"media_ids=1215649475231997953&status=")+etweet+"\" >> twitter.log").c_str()); + system((string("twurl -X POST /1.1/statuses/update.json -d \"status=")+etweet+"\" >> twitter.log").c_str()); + return; } int main(int argc, char **argv) @@ -170,7 +172,7 @@ int main(int argc, char **argv) MiniCurl mc; MiniCurl::MiniCurlHeaders mch; // string url="https://galmon.eu/svs.json"; - string url="http://[::1]:10000/"; + string url="http://[::1]:29599/"; bool doVERSION{false}; CLI::App app(program); @@ -195,8 +197,13 @@ int main(int argc, char **argv) std::variant tst; auto observers = nlohmann::json::parse(mc.getURL(url+"observers.json")); - + + sendTweet("Galmonmon " +string(g_gitHash)+ " started, " + std::to_string(observers.size()) +" observers seen"); cout<<("Galmonmon " +string(g_gitHash)+ " started, " + std::to_string(observers.size()) +" observers seen")< tooOldChange; if(gnssid == 2) @@ -253,6 +268,14 @@ int main(int argc, char **argv) auto seenChange = g_sk.reportState(fullName, "silent", notseen); auto sisaChange = g_sk.reportState(fullName, "sisa", (string)sv["sisa"]); + + double ephdisco = sv.count("latest-disco") ? (double)sv["latest-disco"] : -1.0; + auto ephdiscochange = g_sk.reportState(fullName, "eph-disco", ephdisco); + if(ephdisco == -1.0) + ephdiscochange.reset(); + + double timedisco = sv.count("time-disco") ? fabs((double)sv["time-disco"]) : 0.0; + auto timediscochange = g_sk.reportState(fullName, "time-disco", timedisco); /* cout< 1.45) { + if(ephdisco > 10) + out< 5) + out< 2.5)) { + if(timedisco > 10) + out< 5) + out<