Name change.

master
Nicolas Favre-Felix 14 years ago
parent da21b27c67
commit a42f287685

@ -1,8 +1,8 @@
OUT=dishy OUT=webdis
HIREDIS_OBJ=hiredis/hiredis.o hiredis/sds.o hiredis/net.o hiredis/async.o HIREDIS_OBJ=hiredis/hiredis.o hiredis/sds.o hiredis/net.o hiredis/async.o
JANSSON_OBJ=jansson/src/dump.o jansson/src/error.o jansson/src/hashtable.o jansson/src/load.o jansson/src/strbuffer.o jansson/src/utf.o jansson/src/value.o jansson/src/variadic.o JANSSON_OBJ=jansson/src/dump.o jansson/src/error.o jansson/src/hashtable.o jansson/src/load.o jansson/src/strbuffer.o jansson/src/utf.o jansson/src/value.o jansson/src/variadic.o
FORMAT_OBJS=formats/json.o formats/raw.o FORMAT_OBJS=formats/json.o formats/raw.o
OBJS=dishy.o conf.o $(FORMAT_OBJS) cmd.o server.o $(HIREDIS_OBJ) $(JANSSON_OBJ) OBJS=webdis.o conf.o $(FORMAT_OBJS) cmd.o server.o $(HIREDIS_OBJ) $(JANSSON_OBJ)
CFLAGS=-O3 -Wall -Wextra -I. -Ijansson/src CFLAGS=-O3 -Wall -Wextra -I. -Ijansson/src
LDFLAGS=-levent LDFLAGS=-levent

@ -4,7 +4,7 @@ A very simple prototype providing an HTTP interface to Redis. It uses [hiredis](
<pre> <pre>
make clean all make clean all
./dishy & ./webdis &
curl http://127.0.0.1:7379/SET/hello/world curl http://127.0.0.1:7379/SET/hello/world
→ {"SET":[true,"OK"]} → {"SET":[true,"OK"]}
curl http://127.0.0.1:7379/GET/hello curl http://127.0.0.1:7379/GET/hello

@ -22,7 +22,7 @@ disconnectCallback(const redisAsyncContext *c, int status) {
/* wait 10 msec and reconnect */ /* wait 10 msec and reconnect */
s->tv_reconnect.tv_sec = 0; s->tv_reconnect.tv_sec = 0;
s->tv_reconnect.tv_usec = 100000; s->tv_reconnect.tv_usec = 100000;
dishy_connect(s); webdis_connect(s);
} }
static void static void
@ -59,7 +59,7 @@ on_timer_reconnect(int fd, short event, void *ctx) {
} }
void void
dishy_connect(struct server *s) { webdis_connect(struct server *s) {
/* schedule reconnect */ /* schedule reconnect */
evtimer_set(&s->ev_reconnect, on_timer_reconnect, s); evtimer_set(&s->ev_reconnect, on_timer_reconnect, s);
event_base_set(s->base, &s->ev_reconnect); event_base_set(s->base, &s->ev_reconnect);

@ -1,5 +1,5 @@
#ifndef DISHY_H #ifndef SERVER_H
#define DISHY_H #define SERVER_H
#include <hiredis/async.h> #include <hiredis/async.h>
#include <time.h> #include <time.h>
@ -17,7 +17,7 @@ struct server {
}; };
void void
dishy_connect(struct server *s); webdis_connect(struct server *s);
#endif #endif

@ -58,7 +58,7 @@ main(int argc, char *argv[]) {
if(argc > 1) { if(argc > 1) {
s->cfg = conf_read(argv[1]); s->cfg = conf_read(argv[1]);
} else { } else {
s->cfg = conf_read("dishy.json"); s->cfg = conf_read("webdis.json");
} }
/* ignore sigpipe */ /* ignore sigpipe */
@ -71,7 +71,7 @@ main(int argc, char *argv[]) {
evhttp_set_gencb(http, on_request, s); evhttp_set_gencb(http, on_request, s);
/* attach hiredis to libevent base */ /* attach hiredis to libevent base */
dishy_connect(s); webdis_connect(s);
/* loop */ /* loop */
event_base_dispatch(s->base); event_base_dispatch(s->base);
Loading…
Cancel
Save