GitLab

Merge branch 'trac3769'

Removed Daemon::init() method, improved server log message
descpriptions, and minor typos.

    Added discussion of PID files to start up section for
    each of the servers.

Rendered config_file_ and proc_name_ instance members as there is
no reason for them to be static.

Added PID file creation to DHCP6
    src/bin/dhcp6/dhcp6_messages.mes
    -  added log DHCP6_ALREADY_RUNNING

    src/bin/dhcp6/main.cc
    - added logic to create the PID and catch
    exception specific to PID conflict

    src/bin/dhcp6/tests/Makefile.am
    - exports KEA_PIDFILE_DIR

    src/bin/dhcp6/tests/dhcp6_process_tests.sh.in
    - added call to server_pid_file_test

    src/bin/dhcp6/tests/dhcp6_unittests.cc
    - main(int argc, char* argv[])
    sets env var KEA_PIDFILE_DIR

src/lib/testutils/dhcp_test_lib.sh.in
    - server_pid_file_test() - common test for any server
    to verify PID file management

src/bin/d2/tests/d2_process_tests.sh.in
    remmoved duplicate_server_start_test
    now calls server_pid_file_test

Added PID file creation to DHCP4
    src/bin/dhcp4/dhcp4_messages.mes
    -  added log DHCP4_ALREADY_RUNNING

    src/bin/dhcp4/main.cc
    - added logic to create the PID and catch
    exception specific to PID conflict

    src/bin/dhcp4/tests/Makefile.am
    - exports KEA_PIDFILE_DIR

    src/bin/dhcp4/tests/dhcp4_process_tests.sh.in
    - added call to server_pid_file_test

    src/bin/dhcp4/tests/dhcp4_unittests.cc
    - main(int argc, char* argv[])
    sets env var KEA_PIDFILE_DIR

src/lib/dhcpsrv/daemon.c/h
    Daemon::Daemon() - Constructor will now override the default PID
    directory with the value of env variable KEA_PIDFILE_DIR.  This
    provides a simple means to alter the value for tests.

    Added am_file_author_ flag so Daemon instances will only delete
    a file they have written.

src/lib/testutils/dhcp_test_lib.sh.in
    - verify_server_pid() - new function which verifies that a server has a PID file
    and that it contains the server's PID, and that the process is alive.

src/bin/keactrl/tests/Makefile.am
    - added export of KEA_PIDFILE_DIR to override default PID directory during tests

Added PID file creation to D2
    src/bin/d2/d_controller.cc
    - DControllerBase::launch() - Added block to createPIDFile()

    -DControllerBase::parseArgs() Replaced call to Daemon::init()
    with call to Daemon::setConfigFile()

    src/bin/d2/tests/Makefile.am
    - added export of KEA_PIDFILE_DIR to override default PID directory during tests

    src/bin/d2/tests/d2_process_tests.sh.in
    - dupcliate_server_start_test() - new test which verifies that D2 cannot be
    started twice (with the same configuration file)

    src/bin/d2/tests/d2_unittests.cc
    - main(int argc, char* argv[]) sets environment variable KEA_PIDFILE_DIR
     to override default PID diretory during tests

src/lib/util/pid_file.cc/h
src/lib/util/tests/pid_file_unittest.cc
    Changed PIDFile::check() to return either the PID contained in the PID file
    if the process is alive, or 0, rather than bool.  This permits callers
    to see/log the PID.

src/lib/dhcpsrv/daemon.h/cc
    New methods:
    static void setConfigFile(const std::string& config_file);
    std::string getProcName() const;
    setProcName(const std::string& proc_name);
    std::string getPIDFileDir() const;
    void setPIDFileDir(const std::string& pid_file_dir);
    std::string getPIDFileName() const;
    void setPIDFileName(const std::string& pid_file_name);
    void createPIDFile(int pid = 0);
    std::string makePIDFileName() const;

    New members:
    std::string proc_name_;
    std::string pid_file_dir_;
    isc::util::PIDFilePtr pid_file_;

src/lib/dhcpsrv/tests/daemon_unittest.cc
    New tests:
    TEST_F(DaemonTest, getSetConfigFile)
    TEST_F(DaemonTest, getSetProcName)
    TEST_F(DaemonTest, getSetPIDFileDir)
    TEST_F(DaemonTest, setPIDFileName)
    TEST_F(DaemonTest, makePIDFileName)
    TEST_F(DaemonTest, createPIDFile)
    TEST_F(DaemonTest, createPIDFileOverwrite)
    TEST_F(DaemonTest, PIDFileCleanup)

src/lib/util/pid_file.h
    Added typedef boost::shared_ptr<PIDFile> PIDFilePtr;

Clarifications in the section concerning option values setup.

There were several minor issues related to src/bin/admin tests
that were visible only when distcheck was perfomed with mysql
and/or postgresql enabled.