fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added configuration for cclient update status interval

Browse source
This commit is contained in:
BenDroid 2017-11-03 20:12:04 +01:00
parent 02b3c3d2b0
commit 6ab298eeac
8 changed files with 37 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/Options.cpp
View file

@ -84,7 +84,8 @@ Options:\n"
"\
--cc-url=URL url of the CC Server\n\
--cc-access-token=T access token for CC Server\n\
--cc-worker-id=ID custom worker-id for CC Server\n"
--cc-worker-id=ID custom worker-id for CC Server\n\
--cc-update-interval-s status update interval in seconds (default: 10 min: 1)\n"
# endif
# endif
@ -148,6 +149,7 @@ static struct option const options[] = {
{ "cc-url", 1, nullptr, 4003 },
{ "cc-access-token", 1, nullptr, 4004 },
{ "cc-worker-id", 1, nullptr, 4005 },
{ "cc-update-interval-s", 1, nullptr, 4012 },
{ "cc-port", 1, nullptr, 4006 },
{ "cc-user", 1, nullptr, 4007 },
{ "cc-pass", 1, nullptr, 4008 },
@ -200,9 +202,10 @@ static struct option const api_options[] = {
static struct option const cc_client_options[] = {
{ "url", 1, nullptr, 4003 },
{ "access-token", 1, nullptr, 4004 },
{ "worker-id", 1, nullptr, 4005 },
{ "url", 1, nullptr, 4003 },
{ "access-token", 1, nullptr, 4004 },
{ "worker-id", 1, nullptr, 4005 },
{ "update-interval-s", 1, nullptr, 4012 },
{ 0, 0, 0, 0 }
};
@ -274,6 +277,7 @@ Options::Options(int argc, char **argv) :
m_retries(5),
m_retryPause(5),
m_threads(0),
m_ccUpdateInterval(10),
m_ccPort(0),
m_affinity(-1L)
{
@ -473,6 +477,7 @@ bool Options::parseArg(int key, const char *arg)
free(m_ccCustomDashboard);
m_ccCustomDashboard = strdup(arg);
break;
case 4011: /* --daemonized */
m_daemonized = true;
break;
@ -488,6 +493,8 @@ bool Options::parseArg(int key, const char *arg)
return parseArg(key, strtol(arg, nullptr, 10));
case 4006: /* --cc-port */
return parseArg(key, strtol(arg, nullptr, 10));
case 4012: /* --cc-update-interval-c */
return parseArg(key, strtol(arg, nullptr, 10));
case 'B': /* --background */
case 'k': /* --keepalive */
@ -627,7 +634,14 @@ bool Options::parseArg(int key, uint64_t arg)
m_ccPort = (int) arg;
}
break;
case 4012: /* --cc-update-interval-s */
if (arg < 1) {
showUsage(1);
return false;
}
m_ccUpdateInterval = (int) arg;
break;
default:
break;
}

2
src/Options.h
View file

@ -85,6 +85,7 @@ public:
inline int retries() const { return m_retries; }
inline int retryPause() const { return m_retryPause; }
inline int threads() const { return m_threads; }
inline int ccUpdateInterval() const { return m_ccUpdateInterval; }
inline int ccPort() const { return m_ccPort; }
inline int64_t affinity() const { return m_affinity; }
@ -148,6 +149,7 @@ private:
int m_retries;
int m_retryPause;
int m_threads;
int m_ccUpdateInterval;
int m_ccPort;
int64_t m_affinity;
std::vector<Url*> m_pools;

4
src/cc/CCClient.cpp
View file

@ -74,7 +74,9 @@ CCClient::CCClient(const Options *options)
}
uv_timer_init(uv_default_loop(), &m_timer);
uv_timer_start(&m_timer, CCClient::onReport, kTickInterval, kTickInterval);
uv_timer_start(&m_timer, CCClient::onReport,
static_cast<uint64_t>(m_options->ccUpdateInterval() * 1000),
static_cast<uint64_t>(m_options->ccUpdateInterval() * 1000));
}
CCClient::~CCClient()

1
src/cc/CCClient.h
View file

@ -54,7 +54,6 @@ private:
static void onReport(uv_timer_t *handle);
static int onResponse(char* data, size_t size, size_t nmemb, std::string* responseBuffer);
constexpr static int kTickInterval = 10 * 1000;
const Options *m_options;
static CCClient* m_self;

3
src/config.json
View file

@ -31,6 +31,7 @@
"cc-client": {
"url": "localhost:3344", // url of the CC Server (ip:port)
"access-token": "mySecret", // access token for CC Server (has to be the same in config_cc.json)
"worker-id": null // custom worker-id for CC Server (otherwise hostname is used)
"worker-id": null, // custom worker-id for CC Server (otherwise hostname is used)
"update-interval-s": 10 // status update interval in seconds (default: 10 min: 1)
}
}

3
src/default_config.json
View file

@ -31,6 +31,7 @@
"cc-client": {
"url": "localhost:3344", // url of the CC Server (ip:port)
"access-token": "mySecret", // access token for CC Server (has to be the same in config_cc.json)
"worker-id": null // custom worker-id for CC Server (otherwise hostname is used)
"worker-id": null, // custom worker-id for CC Server (otherwise hostname is used)
"update-interval-s": 10 // status update interval in seconds (default: 10 min: 1)
}
}