diff --git a/Makefile.am b/Makefile.am index 0bbf75350..ee4840986 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = include/ircd SUBDIRS += ircd SUBDIRS += modules -SUBDIRS += charybdis +SUBDIRS += construct SUBDIRS += tools SUBDIRS += doc diff --git a/charybdis/.gitignore b/charybdis/.gitignore deleted file mode 100644 index ac536e13e..000000000 --- a/charybdis/.gitignore +++ /dev/null @@ -1 +0,0 @@ -charybdis diff --git a/configure.ac b/configure.ac index 4e972976e..b43c8604c 100644 --- a/configure.ac +++ b/configure.ac @@ -42,7 +42,7 @@ dnl AC_CONFIG_FILES(\ Makefile \ include/ircd/Makefile \ - charybdis/Makefile \ + construct/Makefile \ ircd/Makefile \ doc/Makefile \ modules/Makefile \ diff --git a/construct/.gitignore b/construct/.gitignore new file mode 100644 index 000000000..8ed94134a --- /dev/null +++ b/construct/.gitignore @@ -0,0 +1 @@ +construct diff --git a/charybdis/Makefile.am b/construct/Makefile.am similarity index 85% rename from charybdis/Makefile.am rename to construct/Makefile.am index c898b0d61..78a3e9fdb 100644 --- a/charybdis/Makefile.am +++ b/construct/Makefile.am @@ -23,9 +23,9 @@ AM_LDFLAGS = \ $(PLATFORM_LDFLAGS) \ ### -bin_PROGRAMS = charybdis +bin_PROGRAMS = construct -charybdis_LDFLAGS = \ +construct_LDFLAGS = \ $(AM_LDFLAGS) \ @ROCKSDB_LDFLAGS@ \ @JS_LDFLAGS@ \ @@ -33,7 +33,7 @@ charybdis_LDFLAGS = \ @SODIUM_LDFLAGS@ \ ### -charybdis_LDADD = \ +construct_LDADD = \ -lircd \ @ROCKSDB_LIBS@ \ @JS_LIBS@ \ @@ -44,8 +44,8 @@ charybdis_LDADD = \ -lz \ ### -charybdis_SOURCES = \ - charybdis.cc \ +construct_SOURCES = \ + construct.cc \ console.cc \ lgetopt.cc \ ### diff --git a/charybdis/README.md b/construct/README.md similarity index 75% rename from charybdis/README.md rename to construct/README.md index e536b1d66..58e7068fa 100644 --- a/charybdis/README.md +++ b/construct/README.md @@ -1,6 +1,6 @@ -# Charybdis Server +# Construct Server -Charybdis is the executable running `libircd`. This application provides an +Construct is the executable running `libircd`. This application provides an interface for the server administrator to start, stop, configure and locally communicate with the daemon. It sets up an `asio::io_service` which is passed to `libircd`, then it sets up signal handling, and then it runs the ios event @@ -8,13 +8,13 @@ loop until commanded to exit. This program executes in the foreground. It does not "daemonize" anymore with a `fork()` etc. You are free to use your shell to execute or move the program -to the background, or simply use a `tmux` or `screen`. Charybdis will output +to the background, or simply use a `tmux` or `screen`. Construct will output the libircd log to stdout and stderr by default. ### Signals -Charybdis handles certain POSIX signals and their behavior is documented -below. Signals are only handled here in the Charybdis executable; libircd +Construct handles certain POSIX signals and their behavior is documented +below. Signals are only handled here in the Construct executable; libircd itself does not use any signal logic (that we know about). * Signal handling is accomplished through `boost::asio`'s mechanism which @@ -25,26 +25,26 @@ this way they can be compatible with windows environments. ##### SIGINT -A `ctrl-c` to Charybdis will bring up the command line console interface. It +A `ctrl-c` to Construct will bring up the command line console interface. It will not halt the daemon. Log messages will be suppressed while the console is waiting for input, but service is still continuing in the background. ##### SIGTSTP -A `ctrl-z` or "Terminal SToP" to Charybdis will bring up the command line +A `ctrl-z` or "Terminal SToP" to Construct will bring up the command line console like with `SIGINT` except that the entire daemon will pause while waiting for console input. When paused, a second `SIGTSTP` will exhibit default behavior so your shell can offer its functionality here. ##### SIGHUP -A "HangUP" to Charybdis is only relevant to the command line console, and +A "HangUP" to Construct is only relevant to the command line console, and signals it to close like an `EOF`. The legacy functionality for reloading server configuration et al is moved to `SIGUSR1`. ##### SIGQUIT -A `ctrl-\` to Charybdis will cleanly shut down the server. It will not generate +A `ctrl-\` to Construct will cleanly shut down the server. It will not generate a coredump. ##### SIGUSR1 diff --git a/charybdis/console.cc b/construct/console.cc similarity index 99% rename from charybdis/console.cc rename to construct/console.cc index 94595d316..0bff41772 100644 --- a/charybdis/console.cc +++ b/construct/console.cc @@ -12,7 +12,7 @@ #include #include #include -#include "charybdis.h" +#include "construct.h" using namespace ircd; diff --git a/charybdis/charybdis.cc b/construct/construct.cc similarity index 97% rename from charybdis/charybdis.cc rename to construct/construct.cc index 28466d342..b691cd0d6 100644 --- a/charybdis/charybdis.cc +++ b/construct/construct.cc @@ -12,7 +12,7 @@ #include #include