projects
/
trinked.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
munin plugin
[trinked.git]
/
main.c
diff --git
a/main.c
b/main.c
index
f5532cd
..
0fb4f1a
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-7,10
+7,10
@@
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ *
notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
+ *
notice, this list of conditions and the following disclaimer in the
+ *
documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
*
* THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@
-42,6
+42,7
@@
static int period = (300); /* in seconds */
static char* pidfile = NULL;
static char* logfile = NULL;
static bool daemonize = false;
static char* pidfile = NULL;
static char* logfile = NULL;
static bool daemonize = false;
+static bool workaround = false;
static char tfile[MAXPATHLEN],
ofile[MAXPATHLEN];
static char tfile[MAXPATHLEN],
ofile[MAXPATHLEN];
@@
-51,7
+52,7
@@
static void
usage(const char *errmsg) {
puts("trinketd - collecting info from AtomPro");
puts("Copyright (c) 2016, Teodor Sigaev <teodor@sigaev.ru>");
usage(const char *errmsg) {
puts("trinketd - collecting info from AtomPro");
puts("Copyright (c) 2016, Teodor Sigaev <teodor@sigaev.ru>");
- puts("trinketd [-d] [-l logfile] [-p pidfile] [-P period] [-D datadir]");
+ puts("trinketd [-d] [-l logfile] [-p pidfile] [-P period] [-D datadir]
[-w]
");
if (errmsg) {
puts("");
if (errmsg) {
puts("");
@@
-76,6
+77,9
@@
restart:
}
while(42) {
}
while(42) {
+ if (workaround)
+ trinketPing();
+
if (trinketGetCumDose(&curDose) != ERR_OK) {
fprintf(stderr, "trinketGetCumDose fails\n");
trinketClose();
if (trinketGetCumDose(&curDose) != ERR_OK) {
fprintf(stderr, "trinketGetCumDose fails\n");
trinketClose();
@@
-99,7
+103,7
@@
restart:
if (successOpen) {
fprintf(fh, "total: %lld\n", (long long)curDose);
fprintf(fh, "counts: %lld\n", (long long)counts);
if (successOpen) {
fprintf(fh, "total: %lld\n", (long long)curDose);
fprintf(fh, "counts: %lld\n", (long long)counts);
- fprintf(fh, "radlevel: %
e
\n", radlevel);
+ fprintf(fh, "radlevel: %
.02f
\n", radlevel);
}
if (fh && fh != stdout) {
}
if (fh && fh != stdout) {
@@
-127,7
+131,7
@@
main(int argn, char* argv[]) {
logfd;
opterr = 0;
logfd;
opterr = 0;
- while((i=getopt(argn,argv,"dD:
p:P:
h")) != EOF) {
+ while((i=getopt(argn,argv,"dD:
l:p:P:w
h")) != EOF) {
switch(i) {
case 'd':
daemonize = true;
switch(i) {
case 'd':
daemonize = true;
@@
-135,12
+139,18
@@
main(int argn, char* argv[]) {
case 'D':
dbdir = strdup(optarg);
break;
case 'D':
dbdir = strdup(optarg);
break;
+ case 'l':
+ logfile = strdup(optarg);
+ break;
case 'p':
pidfile = strdup(optarg);
break;
case 'P':
period = atoi(optarg);
break;
case 'p':
pidfile = strdup(optarg);
break;
case 'P':
period = atoi(optarg);
break;
+ case 'w':
+ workaround = true;
+ break;
case 'h':
default:
usage(NULL);
case 'h':
default:
usage(NULL);