update

jonas8 · Oct 28, 2013 · 4ff5e20 · 4ff5e20
1 parent 9f3627f
commit 4ff5e20
Show file tree

Hide file tree

Showing 24 changed files with 24 additions and 133 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,9 @@
 version.h
 log.txt
 config.h
+comet-server
+online-server
+*.dSYM
 *.pid
 *.o
 *.lo
@@ -13,7 +16,6 @@ tools/benchmark
 *.pyc
 *.swp
 *.exe
-comet
 icomet
 config.mk
 deps/libevent-2.0.21-stable/test

diff --git a/Makefile b/Makefile
@@ -4,13 +4,13 @@ include config.mk
 .PHONY: all tools clean
 
 all:
-	cd src/util; make
-	cd src; make
+	cd util; make
+	cd comet; make
 
 tools:
 	cd tools; make
 
 clean:
-	rm -f *.exe.stackdump icomet
-	cd src/util; make clean
-	cd src; make clean
+	rm -f *.exe.stackdump
+	cd util; make clean
+	cd comet; make clean
diff --git a/icomet.conf → comet.conf b/icomet.conf → comet.conf
@@ -3,23 +3,25 @@
 pidfile = ./icomet.pid
 
 logger:
-	level: debug
+	level: trace
 	output: stdout
 	rotate:
 		size: 1000000000
 
 admin:
-	listen: 127.0.0.1:8000
+	#listen: 127.0.0.1:8000
+	listen: 0.0.0.0:8000
 	# allowed ip prefix, one ip each line
 	allow: 127.0.0.1
 	allow: 192.168
-	deny: all
+	#deny: all
+	#allow: all
 
 front:
 	listen: 0.0.0.0:8100
 	# none|token
-	auth: none
-	max_channels: 1000
+	auth: token
+	max_channels: 1000000
 	max_subscribers_per_channel: 16
 	# number of messages buffered
 	channel_buffer_size: 10

diff --git a/src/Makefile → comet/Makefile b/src/Makefile → comet/Makefile
@@ -1,10 +1,12 @@
 include ../config.mk
 
 OBJS = channel.o server.o
+CFLAGS += -I ../
 
 all: $(OBJS)
-	$(CC) -o ../icomet $(CFLAGS) \
-		util/*.o *.o icomet.cpp \
+	$(CC) -o ../comet-server $(CFLAGS) \
+		comet-server.cpp $(OBJS) \
+		../util/*.o \
 		$(LIBEVENT_PATH)/.libs/libevent.a \
 		$(CLIBS)
 
@@ -13,6 +15,5 @@ channel.o: channel.h channel.cpp
 server.o: server.h server.cpp
 	$(CC) -c $(CFLAGS) server.cpp
 
-
 clean:
-	rm -f *.o
+	rm -f *.o ../comet-server
diff --git a/comet/README.md b/comet/README.md
@@ -0,0 +1 @@
+Periodically shipped most recent presence activities(online, offline) to presence servers
diff --git a/src/channel.cpp → comet/channel.cpp b/src/channel.cpp → comet/channel.cpp
diff --git a/src/channel.h → comet/channel.h b/src/channel.h → comet/channel.h
diff --git a/src/icomet.cpp → comet/comet-server.cpp b/src/icomet.cpp → comet/comet-server.cpp
@@ -13,10 +13,10 @@
 #include "util/config.h"
 #include "util/strings.h"
 #include "util/daemon.h"
+#include "util/ip_filter.h"
 #include "channel.h"
 #include "server.h"
 #include "server_config.h"
-#include "ip_filter.h"
 
 // for testing
 #define MAX_BIND_PORTS 1

diff --git a/src/server.cpp → comet/server.cpp b/src/server.cpp → comet/server.cpp
diff --git a/src/server.h → comet/server.h b/src/server.h → comet/server.h
diff --git a/src/server_config.h → comet/server_config.h b/src/server_config.h → comet/server_config.h
diff --git a/online/README.md b/online/README.md
@@ -0,0 +1 @@
+Connect to comet servers, subscribe presence activities to build presence table.
diff --git a/src/util/config.h b/src/util/config.h
diff --git a/src/util/Makefile → util/Makefile b/src/util/Makefile → util/Makefile
@@ -1,4 +1,4 @@
-include ../../config.mk
+include ../config.mk
 
 OBJS = log.o config.o
 EXES = 

diff --git a/src/util/config.cpp → util/config.cpp b/src/util/config.cpp → util/config.cpp
diff --git a/src/util/daemon.h → util/daemon.h b/src/util/daemon.h → util/daemon.h
diff --git a/src/util/file.h → util/file.h b/src/util/file.h → util/file.h
diff --git a/src/ip_filter.h → util/ip_filter.h b/src/ip_filter.h → util/ip_filter.h
diff --git a/src/util/list.h → util/list.h b/src/util/list.h → util/list.h
diff --git a/src/util/log.cpp → util/log.cpp b/src/util/log.cpp → util/log.cpp
diff --git a/src/util/log.h → util/log.h b/src/util/log.h → util/log.h
diff --git a/src/util/objpool.h → util/objpool.h b/src/util/objpool.h → util/objpool.h
diff --git a/src/util/strings.h → util/strings.h b/src/util/strings.h → util/strings.h
diff --git a/web/js/icomet.js b/web/js/icomet.js
@@ -11,7 +11,6 @@ config = {
 	callback: function(msg){}
 };
 */
-// TODO: let signUrl be optional 
 function iComet(config){
 	var self = this;
 	if(iComet.id__ == undefined){
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Periodically shipped most recent presence activities(online, offline) to presence servers
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Connect to comet servers, subscribe presence activities to build presence table.