construct: Rename directory.
This commit is contained in:
parent
4ae39f5c22
commit
797142f710
|
@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS = -I m4
|
||||||
SUBDIRS = include/ircd
|
SUBDIRS = include/ircd
|
||||||
SUBDIRS += ircd
|
SUBDIRS += ircd
|
||||||
SUBDIRS += modules
|
SUBDIRS += modules
|
||||||
SUBDIRS += charybdis
|
SUBDIRS += construct
|
||||||
SUBDIRS += tools
|
SUBDIRS += tools
|
||||||
SUBDIRS += doc
|
SUBDIRS += doc
|
||||||
|
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
charybdis
|
|
|
@ -42,7 +42,7 @@ dnl
|
||||||
AC_CONFIG_FILES(\
|
AC_CONFIG_FILES(\
|
||||||
Makefile \
|
Makefile \
|
||||||
include/ircd/Makefile \
|
include/ircd/Makefile \
|
||||||
charybdis/Makefile \
|
construct/Makefile \
|
||||||
ircd/Makefile \
|
ircd/Makefile \
|
||||||
doc/Makefile \
|
doc/Makefile \
|
||||||
modules/Makefile \
|
modules/Makefile \
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
construct
|
|
@ -23,9 +23,9 @@ AM_LDFLAGS = \
|
||||||
$(PLATFORM_LDFLAGS) \
|
$(PLATFORM_LDFLAGS) \
|
||||||
###
|
###
|
||||||
|
|
||||||
bin_PROGRAMS = charybdis
|
bin_PROGRAMS = construct
|
||||||
|
|
||||||
charybdis_LDFLAGS = \
|
construct_LDFLAGS = \
|
||||||
$(AM_LDFLAGS) \
|
$(AM_LDFLAGS) \
|
||||||
@ROCKSDB_LDFLAGS@ \
|
@ROCKSDB_LDFLAGS@ \
|
||||||
@JS_LDFLAGS@ \
|
@JS_LDFLAGS@ \
|
||||||
|
@ -33,7 +33,7 @@ charybdis_LDFLAGS = \
|
||||||
@SODIUM_LDFLAGS@ \
|
@SODIUM_LDFLAGS@ \
|
||||||
###
|
###
|
||||||
|
|
||||||
charybdis_LDADD = \
|
construct_LDADD = \
|
||||||
-lircd \
|
-lircd \
|
||||||
@ROCKSDB_LIBS@ \
|
@ROCKSDB_LIBS@ \
|
||||||
@JS_LIBS@ \
|
@JS_LIBS@ \
|
||||||
|
@ -44,8 +44,8 @@ charybdis_LDADD = \
|
||||||
-lz \
|
-lz \
|
||||||
###
|
###
|
||||||
|
|
||||||
charybdis_SOURCES = \
|
construct_SOURCES = \
|
||||||
charybdis.cc \
|
construct.cc \
|
||||||
console.cc \
|
console.cc \
|
||||||
lgetopt.cc \
|
lgetopt.cc \
|
||||||
###
|
###
|
|
@ -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
|
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
|
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
|
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
|
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
|
`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.
|
the libircd log to stdout and stderr by default.
|
||||||
|
|
||||||
### Signals
|
### Signals
|
||||||
|
|
||||||
Charybdis handles certain POSIX signals and their behavior is documented
|
Construct handles certain POSIX signals and their behavior is documented
|
||||||
below. Signals are only handled here in the Charybdis executable; libircd
|
below. Signals are only handled here in the Construct executable; libircd
|
||||||
itself does not use any signal logic (that we know about).
|
itself does not use any signal logic (that we know about).
|
||||||
|
|
||||||
* Signal handling is accomplished through `boost::asio`'s mechanism which
|
* Signal handling is accomplished through `boost::asio`'s mechanism which
|
||||||
|
@ -25,26 +25,26 @@ this way they can be compatible with windows environments.
|
||||||
|
|
||||||
##### SIGINT
|
##### 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
|
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.
|
is waiting for input, but service is still continuing in the background.
|
||||||
|
|
||||||
##### SIGTSTP
|
##### 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
|
console like with `SIGINT` except that the entire daemon will pause while
|
||||||
waiting for console input. When paused, a second `SIGTSTP` will exhibit default
|
waiting for console input. When paused, a second `SIGTSTP` will exhibit default
|
||||||
behavior so your shell can offer its functionality here.
|
behavior so your shell can offer its functionality here.
|
||||||
|
|
||||||
##### SIGHUP
|
##### 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
|
signals it to close like an `EOF`. The legacy functionality for reloading
|
||||||
server configuration et al is moved to `SIGUSR1`.
|
server configuration et al is moved to `SIGUSR1`.
|
||||||
|
|
||||||
##### SIGQUIT
|
##### 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.
|
a coredump.
|
||||||
|
|
||||||
##### SIGUSR1
|
##### SIGUSR1
|
|
@ -12,7 +12,7 @@
|
||||||
#include <ircd/asio.h>
|
#include <ircd/asio.h>
|
||||||
#include <ircd/m/m.h>
|
#include <ircd/m/m.h>
|
||||||
#include <ircd/util/params.h>
|
#include <ircd/util/params.h>
|
||||||
#include "charybdis.h"
|
#include "construct.h"
|
||||||
|
|
||||||
using namespace ircd;
|
using namespace ircd;
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
#include <ircd/asio.h>
|
#include <ircd/asio.h>
|
||||||
#include <RB_INC_SYS_RESOURCE_H
|
#include <RB_INC_SYS_RESOURCE_H
|
||||||
#include "lgetopt.h"
|
#include "lgetopt.h"
|
||||||
#include "charybdis.h"
|
#include "construct.h"
|
||||||
|
|
||||||
namespace fs = ircd::fs;
|
namespace fs = ircd::fs;
|
||||||
|
|
||||||
|
@ -176,16 +176,13 @@ catch(const std::exception &e)
|
||||||
void print_version()
|
void print_version()
|
||||||
{
|
{
|
||||||
printf("VERSION :%s\n",
|
printf("VERSION :%s\n",
|
||||||
ircd::info::version.c_str());
|
RB_VERSION);
|
||||||
|
|
||||||
#ifdef CUSTOM_BRANDING
|
#ifdef CUSTOM_BRANDING
|
||||||
printf("VERSION :based on %s-%s\n",
|
printf("VERSION :based on %s-%s\n",
|
||||||
PACKAGE_NAME,
|
PACKAGE_NAME,
|
||||||
PACKAGE_VERSION);
|
PACKAGE_VERSION);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
printf("VERSION :boost %d\n", BOOST_VERSION);
|
|
||||||
printf("VERSION :RocksDB %s\n", ircd::db::version);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool startup_checks()
|
bool startup_checks()
|
Loading…
Reference in New Issue