rename comet-server -> icomet-server

.gitignore

@@ -2,7 +2,10 @@ version.h
 build.h
 build.mk
 log.txt
-comet-server*
+comet-server
+comet-server-*
+icomet-server
+icomet-server-*
 online-server
 dev_icomet.conf
 *.dSYM

Makefile

@@ -7,7 +7,7 @@ all:
 	mkdir -p logs
 	cd src/util; make
 	cd src/comet; make
-	cp -f comet-server comet-server-`cat version`
+	cp -f icomet-server icomet-server-`cat version`
 
 tools:
 	cd tools; make
@@ -16,7 +16,7 @@ clean:
 	rm -f *.exe.stackdump
 	cd src/util; make clean
 	cd src/comet; make clean
-	rm -f comet-server-*
+	rm -f icomet-server-*
 
 clean_all: clean
 	cd $(JEMALLOC_PATH); make clean

demo/web/forever-iframe.html

@@ -9,7 +9,7 @@
 <pre style="height:200px; width: 600px; border: 1px solid #999; overflow: auto; background: #eee; padding: 8px;">
 ## How to Use?
 
-1. start comet-server
+1. start icomet-server
 
 2. assuming you are running nginx listening on port 8080, if not,
 you will have to modify "8080" in this file to the exact port number,

demo/web/long-polling.html

@@ -9,7 +9,7 @@
 <pre style="height:200px; width: 600px; border: 1px solid #999; overflow: auto; background: #eee; padding: 8px;">
 ## How to Use?
 
-1. start comet-server
+1. start icomet-server
 
 2. assuming you are running nginx listening on port 8080, if not,
 you will have to modify "8080" in this file to the exact port number,

src/comet/Makefile

@@ -4,8 +4,8 @@ OBJS = subscriber.o channel.o server.o
 CFLAGS += -I ../
 
 all: $(OBJS)
-	$(CC) -o ../../comet-server $(CFLAGS) \
-		comet-server.cpp $(OBJS) \
+	$(CC) -o ../../icomet-server $(CFLAGS) \
+		icomet-server.cpp $(OBJS) \
 		../util/*.o \
 		$(LIBEVENT_PATH)/.libs/libevent.a \
 		$(CLIBS)
@@ -18,5 +18,5 @@ server.o: server.h server.cpp
 	$(CC) -c $(CFLAGS) server.cpp
 
 clean:
-	rm -f *.o ../../comet-server
+	rm -f *.o ../../icomet-server
 

src/comet/comet-server.cpp → src/comet/icomet-server.cpp

@@ -50,14 +50,14 @@ void check_pidfile();
 void remove_pidfile();
 
 void welcome(){
-	printf("comet-server %s\n", ICOMET_VERSION);
+	printf("icomet-server %s\n", ICOMET_VERSION);
 	printf("Copyright (c) 2013-2014 ideawu.com\n");
 	printf("\n");
 }
 
 void usage(int argc, char **argv){
 	printf("Usage:\n");
-	printf("    %s [-d] /path/to/comet.conf\n", argv[0]);
+	printf("    %s [-d] /path/to/icomet.conf\n", argv[0]);
 	printf("Options:\n");
 	printf("    -d    run as daemon\n");
 }
@@ -293,7 +293,7 @@ int main(int argc, char **argv){
 	}
 
 	write_pidfile();
-	log_info("icomet started");
+	log_info("icomet-server started");
 	event_base_dispatch(evbase);
 	remove_pidfile();
 
@@ -385,7 +385,7 @@ void init(int argc, char **argv){
 		daemonize();
 	}
 
-	log_info("starting icomet %s...", ICOMET_VERSION);
+	log_info("starting icomet-server %s...", ICOMET_VERSION);
 	log_info("config file: %s", conf_file);
 	log_info("log_level       : %s", conf->get_str("logger.level"));
 	log_info("log_output      : %s", log_output.c_str());

src/comet/server_config.h

@@ -4,7 +4,7 @@
 #include <string>
 #include "util/config.h"
 
-// initialized in comet-server.cpp
+// initialized in icomet-server.cpp
 class ServerConfig{
 public:
 	static int max_channels;