nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some cosmetic changes.

Browse Source
This commit is contained in:
Roland Jax
2014-02-21 12:36:50 +01:00
parent cbb0303aa2
commit 1c4a935696
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+4
View File
@@ -1,6 +1,10 @@
ebus Daemon (ebusd) - ChangeLog ebus Daemon (ebusd) - ChangeLog
=============================== ===============================
2014-02-21:
* fix crash: Create a local copy of the <host:port> string. (thx Hannes Gredler)
* Some cosmetic changes.
2014-02-20: 2014-02-20:
* Missing void declarations in various function parameter added. * Missing void declarations in various function parameter added.
* New branch "socket" created. * New branch "socket" created.
NEWS
+3
View File
@@ -1,6 +1,9 @@
ebus Daemon (ebusd) - NEWS ebus Daemon (ebusd) - NEWS
========================== ==========================
2014-02-21:
* Improved ebus device handling to use tcp based device too.
2013-11-19: 2013-11-19:
* Data type of struct commands.s_type changed from integer to char[2]. * Data type of struct commands.s_type changed from integer to char[2].
contrib/etc/ebusd/ebusd.conf
+2 -2
View File
@@ -6,7 +6,7 @@
# configuration directory of command files (/etc/ebusd) # configuration directory of command files (/etc/ebusd)
#cfgdir=/etc/ebusd #cfgdir=/etc/ebusd
# serial device (/dev/ttyUSB0) # bus device (/dev/ttyUSB0 or host:port)
#device=/dev/ttyUSB0 #device=/dev/ttyUSB0
# extension of command files (csv) # extension of command files (csv)
@@ -21,7 +21,7 @@
# log file (/var/log/ebusd.log) # log file (/var/log/ebusd.log)
#logfile=/var/log/ebusd.log #logfile=/var/log/ebusd.log
# don't check serial device (NO | YES/NO) # don't check bus device (NO | YES/NO)
#nodevicecheck=YES #nodevicecheck=YES
# pid file (/var/run/ebusd.pid) # pid file (/var/run/ebusd.pid)
src/ebusd.c
+5 -5
View File
@@ -105,7 +105,7 @@ static struct config cfg[] = {
{"address", STR, &address, "\tbus address (" NUMSTR(EBUS_QQ) ")"}, {"address", STR, &address, "\tbus address (" NUMSTR(EBUS_QQ) ")"},
{"cfgdir", STR, &cfgdir, "\tconfiguration directory of command files (" DAEMON_CFGDIR ")"}, {"cfgdir", STR, &cfgdir, "\tconfiguration directory of command files (" DAEMON_CFGDIR ")"},
{"cfgfile", STR, &cfgfile, "\tdaemon configuration file (" DAEMON_CFGFILE ")"}, {"cfgfile", STR, &cfgfile, "\tdaemon configuration file (" DAEMON_CFGFILE ")"},
{"device", STR, &device, "\tbus device (" SERIAL_DEVICE ")"}, {"device", STR, &device, "\tbus device (" SERIAL_DEVICE " or host:port)"},
{"extension", STR, &extension, "extension of command files (" DAEMON_EXTENSION ")"}, {"extension", STR, &extension, "extension of command files (" DAEMON_EXTENSION ")"},
{"foreground", BOL, &foreground, "run in foreground"}, {"foreground", BOL, &foreground, "run in foreground"},
{"loglevel", STR, &loglevel, "\tlog level (INF | " LOGTXT ")"}, {"loglevel", STR, &loglevel, "\tlog level (INF | " LOGTXT ")"},
@@ -413,7 +413,7 @@ cleanup(int state)
if (eb_bus_close() == -1) if (eb_bus_close() == -1)
log_print(L_ERR, "can't close device: %s", device); log_print(L_ERR, "can't close device: %s", device);
else else
log_print(L_INF, "%s closed", device); log_print(L_INF, "device %s closed", device);
} }
/* close rawfile */ /* close rawfile */
@@ -510,7 +510,7 @@ main_loop(void)
if (eb_bus_close() == -1) if (eb_bus_close() == -1)
log_print(L_ERR, "can't close device: %s", device); log_print(L_ERR, "can't close device: %s", device);
else else
log_print(L_INF, "%s closed", device); log_print(L_INF, "device %s closed", device);
} }
@@ -519,7 +519,7 @@ main_loop(void)
/* open bus device */ /* open bus device */
if (eb_bus_open(device, &busfd) == 0) { if (eb_bus_open(device, &busfd) == 0) {
log_print(L_INF, "%s opened", device); log_print(L_INF, "device %s opened", device);
sfd_closed = NO; sfd_closed = NO;
} }
@@ -722,7 +722,7 @@ main(int argc, char *argv[])
log_print(L_ALL, "can't open device: %s", device); log_print(L_ALL, "can't open device: %s", device);
cleanup(EXIT_FAILURE); cleanup(EXIT_FAILURE);
} else { } else {
log_print(L_INF, "%s opened", device); log_print(L_INF, "device %s opened", device);
} }