eddy/small_tel
1
0
Fork 0
mirror of https://github.com/eddyem/small_tel.git synced 2026-03-20 08:41:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixed for new vesrion of usefull_macros

Browse Source
This commit is contained in:
Edward Emelianov
2026-01-26 16:54:50 +03:00
parent 50cbaea550
commit a80347643f
25 changed files with 107 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Daemons/weather_database/main.c
View File

@@ -56,7 +56,7 @@ void signals(int signo){
exit(signo);
}
static myoption cmdlnopts[] = {
static sl_option_t cmdlnopts[] = {
{"help", NO_ARGS, NULL, 'h', arg_int, APTR(&G.help), "show this help"},
{"address", NEED_ARG, NULL, 'a', arg_string, APTR(&G.server), "server name or IP"},
{"port", NEED_ARG, NULL, 'p', arg_string, APTR(&G.port), "server port"},
@@ -68,19 +68,19 @@ static myoption cmdlnopts[] = {
int main(int argc, char **argv){
char *self = strdup(argv[0]);
initial_setup();
parseargs(&argc, &argv, cmdlnopts);
if(G.help) showhelp(-1, cmdlnopts);
sl_init();
sl_parseargs(&argc, &argv, cmdlnopts);
if(G.help) sl_showhelp(-1, cmdlnopts);
if(argc > 0) WARNX("Got %d unused keys", argc);
if(!G.dbname) ERRX("Point database file name");
if(!G.server) ERRX("Point server IP or name");
if(!G.port) ERRX("Point server port");
sl_loglevel lvl = LOGLEVEL_ERR + G.v;
sl_loglevel_e lvl = LOGLEVEL_ERR + G.v;
if(lvl > LOGLEVEL_ANY) lvl = LOGLEVEL_ANY;
if(G.logfile) OPENLOG(G.logfile, lvl, 1);
LOGMSG("hello, start");
LOGDBG("SQLite version: %s", sqlite3_libversion());
check4running(self, G.pidfile);
sl_check4running(self, G.pidfile);
// signal reactions:
signal(SIGTERM, signals); // kill (-15) - quit
signal(SIGHUP, SIG_IGN); // hup - ignore
@@ -93,11 +93,11 @@ int main(int argc, char **argv){
while(1){
childpid = fork();
if(childpid){ // master
double t0 = dtime();
double t0 = sl_dtime();
LOGMSG("Created child with pid %d", childpid);
wait(NULL);
LOGWARN("Child %d died", childpid);
if(dtime() - t0 < 1.) pause += 5;
if(sl_dtime() - t0 < 1.) pause += 5;
else pause = 1;
if(pause > 900) pause = 900;
sleep(pause); // wait a little before respawn

8
Daemons/weather_database/socket.c
View File

@@ -78,7 +78,7 @@ static void sendmessage(int fd, const char *msg, int l){
LOGWARN("write()");
WARN("write()");
}else{
if(globlog){ // logging turned ON
if(sl_globlog){ // logging turned ON
tmpbuf[l-1] = 0; // remove trailing '\n' for logging
LOGMSG("SEND to fd %d: %s", fd, tmpbuf);
}
@@ -125,10 +125,10 @@ static int canberead(int fd){
// collect data and write into database
// @return FALSE if can't get full data string
static int getdata(int fd){
double t0 = dtime();
double t0 = sl_dtime();
char buf[BUFSIZ];
int len = 0, leave = BUFSIZ, got = 0;
while(dtime() - t0 < ANS_TIMEOUT){
while(sl_dtime() - t0 < ANS_TIMEOUT){
int r = canberead(fd);
if(r == 0) continue;
r = read(fd, buf + len, leave);
@@ -169,7 +169,7 @@ static int getdata(int fd){
void run_socket(int fd){
double t0 = 0.;
while(1){
double tlast = dtime();
double tlast = sl_dtime();
if(tlast - t0 >= POLLING_INTERVAL){
sendstrmessage(fd, SERVER_COMMAND);
if(getdata(fd)) t0 = tlast;