This one is stable and ran in prod for a long time

- replace keylist with libavl
- allow any number of RE capture groups in proc_line()
- don't close stderr when running external programs
- replace syslog() with logw()
- added TODO

Author: lameventanas

Makefile

@@ -1,7 +1,7 @@
 CFLAGS = -pipe -ggdb
 
 PROGS = reactd
-TESTS = test_reset_list test_ring
+TESTS = test_reset_list test_ring test_hash test_btree
 
 all: $(PROGS)
 tests: $(TESTS)
@@ -11,18 +11,27 @@ debug: CFLAGS += -DDEBUG -ggdb
 debug: all
 	@true
 
+ifneq ($(STATIC),)
+  LDFLAGS+=-static
+  PKGCONFIG_ARGS+=--static
+endif
+# LDFLAGS_pcre = $(shell pcre-config --libs)
+LDFLAGS_pcre = $(shell pkg-config --libs $(PKGCONFIG_ARGS) libpcre)
+
 ifeq ($(DEBUG),)
   CFLAGS += -ggdb -O3 -std=gnu99
 else
-  CFLAGS += -ggdb -std=gnu99 -DDEBUG -DDEBUG_RESET_LIST -DDEBUG_RING
+  CFLAGS += -ggdb -std=gnu99 -DDEBUG -DDEBUG_RESET_LIST -DDEBUG_RING -DDEBUG_HASH -DDEBUG_BTREE
 endif
 
-objects_reactd = reactd_conf.tab.o reactd_conf.lex.yy.o reactd.o keylist.o pcre_subst.o debug.o log.o ring.o reset_list.o
-objects_keylist_test = keylist_test.o keylist.o debug.o
-objects_threshold_test = threshold_test.o threshold.o keylist.o debug.o
+objects_reactd = reactd_conf.tab.o reactd_conf.lex.yy.o reactd.o avl.o pcre_subst.o debug.o log.o ring.o reset_list.o
 objects_subst_test = subst_test.o pcre_subst.o debug.o
 objects_reset_list_test = test_reset_list Test_reset_list.o reset_list_test.o reset_list.o Test_reset_list.c
-objects_ring_test =  test_ring Test_ring.o ring_test.o ring.o Test_ring.c
+objects_ring_test = test_ring ring_test.o Test_ring.o ring.o Test_ring.c
+# objects_keylist_test = keylist_test.o keylist.o debug.o
+# objects_threshold_test = threshold_test.o threshold.o keylist.o debug.o
+# objects_hash_test = test_hash Test_hash.o hash.o Test_hash.c
+# objects_btree_test = test_btree Test_btree.o btree.o Test_btree.c
 
 %.o: %.c %.h
 	$(CC) -c $(CFLAGS) $*.c -o $*.o
@@ -34,19 +43,19 @@ reactd_conf.lex.yy.c: reactd_conf.l reactd_conf.tab.h
 	flex -o reactd_conf.lex.yy.c reactd_conf.l
 
 reactd: $(objects_reactd)
-	$(CC) $(CFLAGS) $(objects_reactd) -lfl -lpcre -lm -o reactd
+	$(CC) $(LDFLAGS) $(CFLAGS) $(objects_reactd) -lfl $(LDFLAGS_pcre) -lm -o reactd
 
-keylist_test: $(objects_keylist_test)
-	$(CC) $(CFLAGS) $(objects_keylist_test) -o keylist_test
-	
-threshold_test: $(objects_threshold_test)
-	$(CC) $(CFLAGS) $(objects_threshold_test) -o threshold_test -lpthread
+# keylist_test: $(objects_keylist_test)
+# 	$(CC) $(CFLAGS) $(objects_keylist_test) -o keylist_test
+
+# threshold_test: $(objects_threshold_test)
+# 	$(CC) $(CFLAGS) $(objects_threshold_test) -o threshold_test -lpthread
 
 subst_test: $(objects_subst_test)
 	$(CC) $(CFLAGS) $(objects_subst_test) -lpcre -o subst_test
 
 clean:
-	rm -f reactd reactd_conf.tab.c reactd_conf.tab.h reactd_conf.lex.yy.c $(objects_reactd) keylist_test $(objects_keylist_test) threshold_test $(objects_threshold_test) subst_test $(objects_subst_test) $(objects_reset_list_test) $(objects_ring_test)
+	rm -f reactd reactd_conf.tab.c reactd_conf.tab.h reactd_conf.lex.yy.c $(objects_reactd) keylist_test $(objects_keylist_test) threshold_test $(objects_threshold_test) subst_test $(objects_subst_test) $(objects_reset_list_test) $(objects_ring_test) $(objects_btree_test)
 
 # Unit Tests
 Test_reset_list.c: reset_list_test.c
@@ -60,3 +69,15 @@ Test_ring.c: ring_test.c
 
 test_ring: CuTest.c Test_ring.o ring_test.o ring.o
 	$(CC) $(CFLAGS) -o $@ $^
+
+# Test_hash.c: hash_test.c
+# 	./make-tests.sh $< > $@
+#
+# test_hash: CuTest.c Test_hash.o hash_test.o hash.o
+# 	$(CC) $(CFLAGS) -o $@ $^
+
+# Test_btree.c: btree_test.c
+# 	./make-tests.sh $< > $@
+#
+# test_btree: CuTest.c Test_btree.o btree_test.o btree.o
+# 	$(CC) $(CFLAGS) -o $@ $^

TODO

@@ -0,0 +1,3 @@
+- Add lexer keys for logging targets (eg: stderr, stdout), and log levels
+- Allow arguments to commands, replace capture groups in arguments/commands
+- Create test unit for subst library