diff options
author | David Sommerseth <davids@redhat.com> | 2010-03-22 18:11:36 +0100 |
---|---|---|
committer | David Sommerseth <davids@redhat.com> | 2010-03-22 18:11:36 +0100 |
commit | f1232c7f4404365ca9cbbf3fc8cbdee7e79bfac0 (patch) | |
tree | f6db322a653d758683e1aace6ce3fa02d37a27c3 | |
parent | d5b6c59136a495b709dfec58b19bec719f86a368 (diff) | |
download | rteval-f1232c7f4404365ca9cbbf3fc8cbdee7e79bfac0.tar.gz rteval-f1232c7f4404365ca9cbbf3fc8cbdee7e79bfac0.tar.xz rteval-f1232c7f4404365ca9cbbf3fc8cbdee7e79bfac0.zip |
Renamed rteval_parserd to rteval-parserd
-rw-r--r-- | server/configure.ac | 2 | ||||
-rw-r--r-- | server/parser/Makefile.am | 6 | ||||
-rw-r--r-- | server/parser/README.parser | 14 | ||||
-rw-r--r-- | server/parser/argparser.c | 2 | ||||
-rw-r--r-- | server/parser/log.c | 4 | ||||
-rw-r--r-- | server/parser/rteval-parserd.c (renamed from server/parser/rteval_parserd.c) | 6 | ||||
-rwxr-xr-x | server/parser/rteval-parserd.init (renamed from server/parser/rteval_parserd.init) | 18 | ||||
-rw-r--r-- | server/parser/rteval-parserd.sysconfig (renamed from server/parser/rteval_parserd.sysconfig) | 6 | ||||
-rw-r--r-- | server/parser/statuses.h | 2 |
9 files changed, 30 insertions, 30 deletions
diff --git a/server/configure.ac b/server/configure.ac index c9db1d6..34712e8 100644 --- a/server/configure.ac +++ b/server/configure.ac @@ -128,7 +128,7 @@ AC_CHECK_LIB([pthread], [pthread_mutex_lock], [DUMMY=], AX_msgMISSINGFUNC()) AC_CHECK_LIB([pthread], [pthread_mutex_unlock], [DUMMY=], AX_msgMISSINGFUNC()) # Back to needed autotools stuff -AC_CONFIG_SRCDIR([parser/rteval_parserd.c]) +AC_CONFIG_SRCDIR([parser/rteval-parserd.c]) AC_CONFIG_HEADERS([parser/config.h]) AC_CONFIG_FILES([Makefile parser/Makefile]) diff --git a/server/parser/Makefile.am b/server/parser/Makefile.am index 0ca5288..d328162 100644 --- a/server/parser/Makefile.am +++ b/server/parser/Makefile.am @@ -27,7 +27,7 @@ AM_CPPFLAGS = $(LIBXML2_INC) $(LIBXSLT_INC) $(LIBPQ_INC) # What is required to build rteval_parserd -bin_PROGRAMS = rteval_parserd +bin_PROGRAMS = rteval-parserd rteval_parserd_SOURCES = argparser.c argparser.h \ configparser.c configparser.h \ eurephia_nullsafe.c eurephia_nullsafe.h eurephia_values_struct.h \ @@ -38,7 +38,7 @@ rteval_parserd_SOURCES = argparser.c argparser.h \ pgsql.c pgsql.h \ sha1.c sha1.h \ xmlparser.c xmlparser.h \ - rteval_parserd.c statuses.h + rteval-parserd.c statuses.h # Don't build, only install xsltdir=$(datadir)/rteval @@ -46,4 +46,4 @@ dist_xslt_DATA = xmlparser.xsl # Copy init script and config file example to the docs dir initscriptdir=$(docdir)/initscripts -dist_initscript_DATA = rteval_parserd.init rteval_parserd.sysconfig +dist_initscript_DATA = rteval-parserd.init rteval-parserd.sysconfig diff --git a/server/parser/README.parser b/server/parser/README.parser index cacff94..d156b96 100644 --- a/server/parser/README.parser +++ b/server/parser/README.parser @@ -6,7 +6,7 @@ The purpose of the daemon is to off load the web server from the heavy duty work of parsing and processing the rteval XML reports. The XML-RPC server will receive the reports and put the files in a queue directory on the file system and register the the submission in the database. This will notify -the rteval_parsed that a new report has been received and it will start +the rteval-parsed that a new report has been received and it will start processing that file independently of the web/XML-RPC server. @@ -17,17 +17,17 @@ README.xmlrpc file for more information about the building and installation process. Please read the README.xmlrpc file also for setting up and preparing -the database which the rteval_parserd program will be using. This +the database which the rteval-parserd program will be using. This file will also contain information regarding upgrading the database. If you are installing this application from a binary package, like RPM -files on Fedora/RHEL based boxes, you should have the rteval_parserd +files on Fedora/RHEL based boxes, you should have the rteval-parserd in your $PATH and the needed file for the parsing (xmlparser.xsl) -should be installed in a directory rteval_parserd where look for it by +should be installed in a directory rteval-parserd where look for it by default. -** Configure rteval_parsed +** Configure rteval-parsed This daemon uses the same configuration file as the rest of the rteval program suite, /etc/rteval.conf. It will parse the section named 'xmlrpc_parser'. @@ -70,7 +70,7 @@ The default values are: and the parser can be killed by the kernel (OOM). -** rteval_parserd arguments +** rteval-parserd arguments -d | --daemon Run as a daemon -l | --log <log dest> Where to put log data @@ -148,7 +148,7 @@ different database implementation. In the current implementation, it makes use of PostgreSQL's LISTEN, NOTIFY and UNLISTEN features. A trigger is enabled on the submission queue table, which -sends a NOTIFY whenever a record is inserted into the table. The rteval_parser +sends a NOTIFY whenever a record is inserted into the table. The rteval-parser daemon listens for these notifications, and will immediately poll the table upon such a notification. diff --git a/server/parser/argparser.c b/server/parser/argparser.c index e9d523a..6ad4c69 100644 --- a/server/parser/argparser.c +++ b/server/parser/argparser.c @@ -31,7 +31,7 @@ * Print a help screen to stdout */ void usage() { - printf("rteval_parserd: Parses new reports recieved via XML-RPC\n" + printf("rteval-parserd: Parses new reports recieved via XML-RPC\n" "\n" "This program will wait for changes to the rteval 'submissionqueue' table.\n" "When a new report is registered here, it will send this report to one of\n" diff --git a/server/parser/log.c b/server/parser/log.c index b7c2ad8..4d1de16 100644 --- a/server/parser/log.c +++ b/server/parser/log.c @@ -92,7 +92,7 @@ LogContext *init_log(const char *logdest, const char *loglvl) { if( logdest == NULL ) { logctx->logtype = ltSYSLOG; - openlog("rteval_parserd", LOG_PID, LOG_DAEMON); + openlog("rteval-parserd", LOG_PID, LOG_DAEMON); } else { if( strncmp(logdest, "syslog:", 7) == 0 ) { const char *fac = logdest+7; @@ -118,7 +118,7 @@ LogContext *init_log(const char *logdest, const char *loglvl) { facid = LOG_USER; } logctx->logtype = ltSYSLOG; - openlog("rteval_parserd", LOG_PID, facid); + openlog("rteval-parserd", LOG_PID, facid); } else if( strcmp(logdest, "stderr:") == 0 ) { logctx->logtype = ltCONSOLE; logctx->logfp = stderr; diff --git a/server/parser/rteval_parserd.c b/server/parser/rteval-parserd.c index c9129ff..01287a0 100644 --- a/server/parser/rteval_parserd.c +++ b/server/parser/rteval-parserd.c @@ -12,7 +12,7 @@ */ /** - * @file rteval_parserd.c + * @file rteval-parserd.c * @author David Sommerseth <davids@redhat.com> * @date Thu Oct 15 11:59:27 2009 * @@ -84,7 +84,7 @@ void sigcatch(int sig) { /** * Opens and reads /proc/sys/fs/mqueue/msg_max, to get the maximum number of allowed messages - * on POSIX MQ queues. rteval_parserd will use as much of this as possible when needed. + * on POSIX MQ queues. rteval-parserd will use as much of this as possible when needed. * * @return Returns the system msg_max value, or DEFAULT_MSG_MAX on failure to read the setting. */ @@ -523,7 +523,7 @@ int main(int argc, char **argv) { xmlCleanupParser(); xsltCleanupGlobals(); - writelog(logctx, LOG_EMERG, "rteval_parserd is stopped"); + writelog(logctx, LOG_EMERG, "rteval-parserd is stopped"); close_log(logctx); return rc; } diff --git a/server/parser/rteval_parserd.init b/server/parser/rteval-parserd.init index d0414f7..a7da9db 100755 --- a/server/parser/rteval_parserd.init +++ b/server/parser/rteval-parserd.init @@ -1,6 +1,6 @@ #!/bin/bash # -# rteval_parserd rteval parser daemon +# rteval-parserd rteval report parser daemon # # Author: David Sommerseth <davids@redhat.com> # @@ -8,25 +8,25 @@ # Released under the GPL # # chkconfig: - 20 80 -# description: The rteval_parserd waits for rteval summary reports and parses them on arrival -# config: /etc/sysconfig/rteval_parserd +# description: The rteval-parserd waits for rteval summary reports and parses them on arrival +# config: /etc/sysconfig/rteval-parserd # ### BEGIN INIT INFO -# Provides: rteval_parserd +# Provides: rteval-parserd # Required-Start: postgresql # Required-Stop: - # Default-Stop: 0 1 6 -# Short-Description: start and stop rteval_parserd -# Description: The rteval_parserd waits for rteval summary reports and parses them on arrival +# Short-Description: start and stop rteval-parserd +# Description: The rteval-parserd waits for rteval summary reports and parses them on arrival ### END INIT INFO . /etc/rc.d/init.d/functions -if [ -f /etc/sysconfig/rteval_parserd ]; then - . /etc/sysconfig/rteval_parserd +if [ -f /etc/sysconfig/rteval-parserd ]; then + . /etc/sysconfig/rteval-parserd fi -prog=rteval_parserd +prog=rteval-parserd RETVAL=0 if [ -z $PIDFILE ]; then diff --git a/server/parser/rteval_parserd.sysconfig b/server/parser/rteval-parserd.sysconfig index c181c44..c57f48c 100644 --- a/server/parser/rteval_parserd.sysconfig +++ b/server/parser/rteval-parserd.sysconfig @@ -1,4 +1,4 @@ -# Configuration parameters for rteval_parserd +# Configuration parameters for rteval-parserd # *** Number of worker threads # * When this is not set, the default will be one thread per CPU core @@ -19,5 +19,5 @@ LOGLEVEL=notice # CONFIGFILE=/etc/rteval.conf # *** PID file -# * Full path to where to look for the PID file, defaults to /var/run/rteval_parserd.pid -# PIDFILE=/var/run/rteval_parserd.pid +# * Full path to where to look for the PID file, defaults to /var/run/rteval-parserd.pid +# PIDFILE=/var/run/rteval-parserd.pid diff --git a/server/parser/statuses.h b/server/parser/statuses.h index 6edeac6..1320c17 100644 --- a/server/parser/statuses.h +++ b/server/parser/statuses.h @@ -16,7 +16,7 @@ * @author David Sommerseth <davids@redhat.com> * @date Wed Oct 21 11:17:24 2009 * - * @brief Status values used by rteval_parserd + * @brief Status values used by rteval-parserd * */ |