meutel/bouquins-bchs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

logging and debug mode

Browse Source
This commit is contained in:
Meutel 2017-01-15 11:43:07 +01:00
parent 7b49530569
commit 114e075d6d
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -72,6 +72,10 @@ CFLAGS += -DDATADIR=\"$(RDDIR)\"
CFLAGS += -DDATABASE=\"$(DATABASE)\" CFLAGS += -DDATABASE=\"$(DATABASE)\"
VERSION = 0.0.0 VERSION = 0.0.0
.if defined(DEBUG)
CFLAGS += -DDEBUG
.endif
all: $(TARGET) $(HTMLS) $(JSMINS) all: $(TARGET) $(HTMLS) $(JSMINS)
api: swagger.json api: swagger.json

6
extern.h
View File

@ -19,6 +19,12 @@
#ifndef EXTERN_H #ifndef EXTERN_H
#define EXTERN_H #define EXTERN_H
#ifdef DEBUG
#define debug(r, ...) kutil_logx(r, "DEBUG", NULL, __VA_ARGS__)
#else
#define debug(r, ...)
#endif
/* /*
* A book series. * A book series.
*/ */

11
main.c
View File

@ -22,6 +22,7 @@
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <errno.h>
#include <kcgi.h> #include <kcgi.h>
#include <kcgijson.h> #include <kcgijson.h>
@ -272,6 +273,7 @@ sendbooks(struct kreq *r)
BookFull *b = NULL; BookFull *b = NULL;
int res, i = 0; int res, i = 0;
debug(r, "sendbooks");
int page = initpage(r); int page = initpage(r);
int per = initperpage(r); int per = initperpage(r);
const char* sort = initsort(r); const char* sort = initsort(r);
@ -333,6 +335,7 @@ sendauthors(struct kreq *r)
int res, i = 0; int res, i = 0;
AuthorFull *a = NULL; AuthorFull *a = NULL;
debug(r, "sendauthors");
int page = initpage(r); int page = initpage(r);
int per = initperpage(r); int per = initperpage(r);
const char* sort = initsort(r); const char* sort = initsort(r);
@ -385,6 +388,7 @@ sendseries(struct kreq *r)
int res, i = 0; int res, i = 0;
SeriesFull *s = NULL; SeriesFull *s = NULL;
debug(r, "sendseries");
int page = initpage(r); int page = initpage(r);
int per = initperpage(r); int per = initperpage(r);
const char* sort = initsort(r); const char* sort = initsort(r);
@ -454,6 +458,7 @@ sendindex(struct kreq *r)
{ {
struct kjsonreq req; struct kjsonreq req;
debug(r, "sendindex");
http_open(r, KHTTP_200); http_open(r, KHTTP_200);
kjson_open(&req, r); kjson_open(&req, r);
kjson_obj_open(&req); kjson_obj_open(&req);
@ -468,6 +473,8 @@ main(void)
struct kreq r; struct kreq r;
enum kcgi_err er; enum kcgi_err er;
kutil_openlog(LOGFILE);
/* Actually parse HTTP document. */ /* Actually parse HTTP document. */
er = khttp_parsex(&r, ksuffixmap, er = khttp_parsex(&r, ksuffixmap,
@ -488,6 +495,7 @@ main(void)
} }
#endif #endif
/* /*
* Front line of defence: make sure we're a proper method, make * Front line of defence: make sure we're a proper method, make
* sure we're a page, make sure we're a JSON file. * sure we're a page, make sure we're a JSON file.
@ -506,12 +514,15 @@ main(void)
return(EXIT_SUCCESS); return(EXIT_SUCCESS);
} }
debug(&r, "Opening database at %s/%s", DATADIR, DATABASE);
if ( ! db_open(&r, DATADIR "/" DATABASE)) { if ( ! db_open(&r, DATADIR "/" DATABASE)) {
kutil_warn(&r, NULL, "Error opening database at %s/%s", DATADIR, DATABASE);
http_open(&r, KHTTP_500); http_open(&r, KHTTP_500);
json_emptydoc(&r); json_emptydoc(&r);
khttp_free(&r); khttp_free(&r);
return(EXIT_SUCCESS); return(EXIT_SUCCESS);
} }
debug(&r, "Database ready %s/%s", DATADIR, DATABASE);
switch (r.page) { switch (r.page) {
case (PAGE_INDEX): case (PAGE_INDEX):