Skip to content

Commit 6d8d33a

Browse files
committed
confd: clean up, simplify use common log framework
- Use same log frameworks as reset of confd - Use existing primitives from libite + libsrx - Drop remaining pthreads - Coding style fixes Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
1 parent a156418 commit 6d8d33a

3 files changed

Lines changed: 156 additions & 306 deletions

File tree

package/confd/confd.conf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
# Single daemon handles gen-config, datastore init, config load, and plugins
44
# log:prio:daemon.err
55
service log:console env:/etc/default/confd \
6-
[S12345] <usr/ixinit> confd -f -n -v warning \
6+
[S12345] <usr/ixinit> confd -f -v warning \
77
-F /etc/factory-config.cfg \
88
-S /cfg/startup-config.cfg \
99
-E /etc/failure-config.cfg \
10-
-p /run/confd.pid \
1110
-t $CONFD_TIMEOUT \
1211
-- Configuration daemon

src/confd/src/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ plugin_LTLIBRARIES = confd-plugin.la
66

77
sbin_PROGRAMS = confd
88

9-
confd_CFLAGS = $(sysrepo_CFLAGS) $(libyang_CFLAGS) $(jansson_CFLAGS) $(libite_CFLAGS)
10-
confd_LDADD = $(sysrepo_LIBS) $(libyang_LIBS) $(jansson_LIBS) $(libite_LIBS) $(EV_LIBS) -ldl
9+
confd_CFLAGS = $(sysrepo_CFLAGS) $(libyang_CFLAGS) $(jansson_CFLAGS) $(libite_CFLAGS) $(libsrx_CFLAGS)
10+
confd_LDADD = $(sysrepo_LIBS) $(libyang_LIBS) $(jansson_LIBS) $(libite_LIBS) $(libsrx_LIBS) $(EV_LIBS) -ldl
1111
confd_SOURCES = main.c
1212

1313
confd_plugin_la_LDFLAGS = -module -avoid-version -shared

0 commit comments

Comments
 (0)