master
Nicolas Favre-Felix 14 years ago
parent 1ea4a62f3d
commit f25e7bfb87

@ -1,8 +1,8 @@
OUT=turnip
OUT=dishy
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
FORMAT_OBJS=formats/json.o formats/raw.o
OBJS=turnip.o conf.o $(FORMAT_OBJS) cmd.o server.o $(HIREDIS_OBJ) $(JANSSON_OBJ)
OBJS=dishy.o conf.o $(FORMAT_OBJS) cmd.o server.o $(HIREDIS_OBJ) $(JANSSON_OBJ)
CFLAGS=-O3 -Wall -Wextra -I. -Ijansson/src
LDFLAGS=-levent

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

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

@ -21,7 +21,7 @@ disconnectCallback(const redisAsyncContext *c, int status) {
printf("disconnected, schedule reconnect.\n");
s->ac = NULL;
turnip_connect(s);
dishy_connect(s);
}
static void
@ -60,7 +60,7 @@ on_timer_reconnect(int fd, short event, void *ctx) {
}
void
turnip_connect(struct server *s) {
dishy_connect(struct server *s) {
/* schedule reconnect */
evtimer_set(&s->ev_reconnect, on_timer_reconnect, s);
event_base_set(s->base, &s->ev_reconnect);

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

Loading…
Cancel
Save