tastytea/expandurl-mastodon
1
0
Fork 0
Code Issues 1 Pull Requests Releases 5 Wiki Activity

Fixed reconnect issues, hopefully

Browse Source 
Make the main thread sleep when the stream thread sleeps due to a connection error.
This should solve the problem of having multiple stream threads running doing too many connection attempts
This commit is contained in:
tastytea 2018-05-28 13:23:16 +02:00
parent 2c955a2a18
commit 50d3ab6bba
Signed by: tastytea
GPG Key ID: 59346E0EA35C67E5
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1,6 +1,6 @@
cmake_minimum_required (VERSION 3.7) cmake_minimum_required (VERSION 3.7)
project (expandurl-mastodon project (expandurl-mastodon
VERSION 0.8.0 VERSION 0.8.1
LANGUAGES CXX LANGUAGES CXX
) )

1
src/main.cpp
View File

@ -75,7 +75,6 @@ int main(int argc, char *argv[])
listener.stop(); listener.stop();
syslog(LOG_DEBUG, "Reestablishing connection..."); syslog(LOG_DEBUG, "Reestablishing connection...");
listener.start(); listener.start();
syslog(LOG_NOTICE, "Reestablished connection.");
new_messages = listener.catchup(); new_messages = listener.catchup();
} }

8
src/masto.cpp
View File

@ -112,6 +112,10 @@ const void Listener::start()
{ {
syslog(LOG_NOTICE, "Connected to %s", _instance.c_str()); syslog(LOG_NOTICE, "Connected to %s", _instance.c_str());
} }
else if (ret != 14)
{ // If the stream thread sleeps, the main thread should sleep too
std::this_thread::sleep_for(std::chrono::seconds(60));
}
} }
const void Listener::stop() const void Listener::stop()
@ -192,6 +196,10 @@ const std::vector<Easy::Notification> Listener::catchup()
v.push_back(Easy::Notification(str)); v.push_back(Easy::Notification(str));
} }
} }
else
{
syslog(LOG_ERR, "Could not catch up: Error %u", ret);
}
} }
return v; return v;