[Perfparse-cvs] _perfparse/libpp_common Makefile.am, 1.1.1.1, 1.2 Makefile.in, 1.21, 1.22 config_fi

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/perfparse/_perfparse/libpp_common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10160/libpp_common

Modified Files:
	Makefile.am Makefile.in config_file.c 
Log Message:
some refactoring


Index: Makefile.in
===================================================================
RCS file: /cvsroot/perfparse/_perfparse/libpp_common/Makefile.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Makefile.in	18 Dec 2007 15:10:33 -0000	1.21
--- Makefile.in	3 Jan 2008 22:04:44 -0000	1.22
***************
*** 262,266 ****
  libpp_common_la_CPPFLAGS = '-DLIBDIR="${libdir}"' '-DLOCALSTATEDIR="$(localstatedir)"' '-DSYSCONFDIR="$(sysconfdir)"' '-DPREFIX="$(prefix)"' ${GLIB_CFLAGS} ${ZLIB_CFLAGS} '-DLOCALEDIR="$(datadir)/locale"' -I${top_srcdir}
  libpp_common_la_LIBADD = ${ZLIB_LIBS}
! libpp_common_la_LDFLAGS = 
  all: all-am
  
--- 262,266 ----
  libpp_common_la_CPPFLAGS = '-DLIBDIR="${libdir}"' '-DLOCALSTATEDIR="$(localstatedir)"' '-DSYSCONFDIR="$(sysconfdir)"' '-DPREFIX="$(prefix)"' ${GLIB_CFLAGS} ${ZLIB_CFLAGS} '-DLOCALEDIR="$(datadir)/locale"' -I${top_srcdir}
  libpp_common_la_LIBADD = ${ZLIB_LIBS}
! libpp_common_la_LDFLAGS = -version-info 1:0:0
  all: all-am
  

Index: Makefile.am
===================================================================
RCS file: /cvsroot/perfparse/_perfparse/libpp_common/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.am	26 Sep 2005 14:36:33 -0000	1.1.1.1
--- Makefile.am	3 Jan 2008 22:04:44 -0000	1.2
***************
*** 5,8 ****
  libpp_common_la_CPPFLAGS='-DLIBDIR="${libdir}"' '-DLOCALSTATEDIR="$(localstatedir)"' '-DSYSCONFDIR="$(sysconfdir)"' '-DPREFIX="$(prefix)"' ${GLIB_CFLAGS} ${ZLIB_CFLAGS} '-DLOCALEDIR="$(datadir)/locale"' -I${top_srcdir}
  libpp_common_la_LIBADD = ${ZLIB_LIBS}
! libpp_common_la_LDFLAGS =
  
--- 5,8 ----
  libpp_common_la_CPPFLAGS='-DLIBDIR="${libdir}"' '-DLOCALSTATEDIR="$(localstatedir)"' '-DSYSCONFDIR="$(sysconfdir)"' '-DPREFIX="$(prefix)"' ${GLIB_CFLAGS} ${ZLIB_CFLAGS} '-DLOCALEDIR="$(datadir)/locale"' -I${top_srcdir}
  libpp_common_la_LIBADD = ${ZLIB_LIBS}
! libpp_common_la_LDFLAGS = -version-info 1:0:0
  

Index: config_file.c
===================================================================
RCS file: /cvsroot/perfparse/_perfparse/libpp_common/config_file.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** config_file.c	18 Dec 2007 00:03:00 -0000	1.8
--- config_file.c	3 Jan 2008 22:04:44 -0000	1.9
***************
*** 122,127 ****
  	config_item_add(config_definition, 	CONFIG_ITEM_ID_SERVER_PORT, "Server_Port", "1976", _("Server port"), _("Port for perfparsed server\n# Put 0 or \"\" to disable the server"), "-p", "--port", TYPE_INT, 1);
  	config_item_add(config_definition, 	CONFIG_ITEM_ID_SERVICE_LOG, "Service_Log", "/" LOCALSTATEDIR "/serviceperf.log", _("Input log source (from nagios or perfparsed)"), _("Log source from nagios (or other tools) that perfparse will scan\n# Authorized values: a file name, '-' for stdin, '|' for a fifo and '>' for a host:port socket\n# For sockets, a command 'history' will be sent before retreiving the data"), "-l", "--serviceperf-log", TYPE_STRING, 1);
! 	config_item_add(config_definition, 	CONFIG_ITEM_ID_SERVICE_LOG_SAVE_POSITION, "Service_Log_Save_Position", "yes", _("Save the read position"), _("Save the read position in the nagios log file ? If yes, perfparse will start from that position instead of from the beginning"), NULL, NULL, TYPE_BOOLEAN, 1);
! 	config_item_add(config_definition, 	CONFIG_ITEM_ID_SERVICE_LOG_POSITION_MARK_PATH, "Service_Log_Position_Mark_Path", "/" LOCALSTATEDIR "/serviceperf.mark" , _("Position mark file path"), _("Path for files containing the read position for nagios log files"), NULL, NULL, TYPE_STRING, 1);
  	config_item_add(config_definition, 	CONFIG_ITEM_ID_HISTORY_START_TM, "History_Start_Tm", "-86400", _("Start timestamp for history retreiving"), _("Start timestamp for history retreiving (positive is absolute, negative is relative to end tm)"), NULL, "--history_start_tm", TYPE_INT, 1);
  	config_item_add(config_definition, 	CONFIG_ITEM_ID_HISTORY_END_TM, "History_End_Tm", "-30", _("End timestamp for history retreiving"), _("End timestamp for history retreiving (positive is absolute, negative is relative to Now)"), NULL, "--history_end_tm", TYPE_INT, 1);
--- 122,127 ----
  	config_item_add(config_definition, 	CONFIG_ITEM_ID_SERVER_PORT, "Server_Port", "1976", _("Server port"), _("Port for perfparsed server\n# Put 0 or \"\" to disable the server"), "-p", "--port", TYPE_INT, 1);
  	config_item_add(config_definition, 	CONFIG_ITEM_ID_SERVICE_LOG, "Service_Log", "/" LOCALSTATEDIR "/serviceperf.log", _("Input log source (from nagios or perfparsed)"), _("Log source from nagios (or other tools) that perfparse will scan\n# Authorized values: a file name, '-' for stdin, '|' for a fifo and '>' for a host:port socket\n# For sockets, a command 'history' will be sent before retreiving the data"), "-l", "--serviceperf-log", TYPE_STRING, 1);
! 	config_item_add(config_definition, 	CONFIG_ITEM_ID_SERVICE_LOG_SAVE_POSITION, "Service_Log_Save_Position", "yes", _("Save the read position"), _("Save the read position in the Service_Log file ? If yes, perfparse will start from that position instead of from the beginning"), NULL, NULL, TYPE_BOOLEAN, 1);
! 	config_item_add(config_definition, 	CONFIG_ITEM_ID_SERVICE_LOG_POSITION_MARK_PATH, "Service_Log_Position_Mark_Path", "/" LOCALSTATEDIR "/serviceperf.mark" , _("Position mark file path"), _("Path for file containing the read position for Service_Log file"), NULL, NULL, TYPE_STRING, 1);
  	config_item_add(config_definition, 	CONFIG_ITEM_ID_HISTORY_START_TM, "History_Start_Tm", "-86400", _("Start timestamp for history retreiving"), _("Start timestamp for history retreiving (positive is absolute, negative is relative to end tm)"), NULL, "--history_start_tm", TYPE_INT, 1);
  	config_item_add(config_definition, 	CONFIG_ITEM_ID_HISTORY_END_TM, "History_End_Tm", "-30", _("End timestamp for history retreiving"), _("End timestamp for history retreiving (positive is absolute, negative is relative to Now)"), NULL, "--history_end_tm", TYPE_INT, 1);

[Perfparse-cvs] _perfparse/libpp_common Makefile.am, 1.1.1.1, 1.2 Makefile.in, 1.21, 1.22 config_fi

[Perfparse-cvs] _perfparse/libpp_common Makefile.am, 1.1.1.1, 1.2 Makefile.in, 1.21, 1.22 config_file.c, 1.8, 1.9