[Perfparse-cvs] _perfparse/modules libpp_storage.h, 1.3, 1.4 storage_mysql.c, 1.20, 1.21 storage_mysql.h, 1.7, 1.8

[Florian G. <re...@us...>]

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

Modified Files:
	libpp_storage.h storage_mysql.c storage_mysql.h 
Log Message:
added version information to storage module api and renamed upcoming version.


Index: libpp_storage.h
===================================================================
RCS file: /cvsroot/perfparse/_perfparse/modules/libpp_storage.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** libpp_storage.h	18 Dec 2007 00:03:00 -0000	1.3
--- libpp_storage.h	18 Dec 2007 15:08:50 -0000	1.4
***************
*** 28,31 ****
--- 28,34 ----
  #define __LIB_STORAGE__
  
+ // versioning for storage modules to avoid loading of incompatible modules
+ #define STORAGE_MODULE_API_VERSION 2
+ 
  #include <time.h>
  #include <stdio.h>

Index: storage_mysql.h
===================================================================
RCS file: /cvsroot/perfparse/_perfparse/modules/storage_mysql.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** storage_mysql.h	10 Dec 2007 18:55:09 -0000	1.7
--- storage_mysql.h	18 Dec 2007 15:08:50 -0000	1.8
***************
*** 32,35 ****
--- 32,36 ----
  
  #define STORAGE_MYSQL_VERSION "0.0.2"
+ #define STORAGE_MYSQL_API_VER 2
  
  int storage_mysql_init(void);

Index: storage_mysql.c
===================================================================
RCS file: /cvsroot/perfparse/_perfparse/modules/storage_mysql.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** storage_mysql.c	17 Dec 2007 20:49:53 -0000	1.20
--- storage_mysql.c	18 Dec 2007 15:08:50 -0000	1.21
***************
*** 115,118 ****
--- 115,122 ----
  }
  
+ int storage_module_api_version(void) {
+ 	return(STORAGE_MYSQL_API_VER);
+ }
+ 
  int storage_mysql_connect(struct storage_module_t *this) {
  	pp_log_func;
***************
*** 462,491 ****
  		if(raw_policyinfo->iPolicySeconds>1) {
  			dps=t-raw_policyinfo->iPolicySeconds;
! 			pp_log(__FILE__,__LINE__,LOG_INFO,_("Purging raw data older than %s from service '%s', ServiceId %d due to "),
  				asctime(localtime(&dps)),raw_policyinfo->sServiceDesc,
  				raw_policyinfo->iServiceId);
  			switch(raw_policyinfo->iPolicySource) {
  				case DEL_POLICY_SOURCE_SERVICE:
! 					pp_log(__FILE__,__LINE__,LOG_INFO,_("individual service setting\n"));
  				  break;
  				case DEL_POLICY_SOURCE_HOST:
! 					pp_log(__FILE__,__LINE__,LOG_INFO,_("individual host setting\n"));
  				  break;
  				case DEL_POLICY_SOURCE_HOSTGROUP:
! 					pp_log(__FILE__,__LINE__,LOG_INFO,_("individual hostgroup setting\n"));
  				  break;
  				case DEL_POLICY_SOURCE_SERVICE_GROUP:
! 					pp_log(__FILE__,__LINE__,LOG_INFO,_("group '%s' setting in service.\n"),raw_policyinfo->sPolicyName);
  				  break;
  				case DEL_POLICY_SOURCE_HOST_GROUP:
! 					pp_log(__FILE__,__LINE__,LOG_INFO,_("group '%s' setting in host.\n"),raw_policyinfo->sPolicyName);
  				  break;
  				case DEL_POLICY_SOURCE_HOSTGROUP_GROUP:
! 					pp_log(__FILE__,__LINE__,LOG_INFO,_("group '%s' setting in hostgroup.\n"),raw_policyinfo->sPolicyName);
  				  break;
  				case DEL_POLICY_SOURCE_DEFAULT:
  					pp_log_fl(LOG_INFO,_("default setting.\n"));
  				default:
! 				  pp_log(__FILE__,__LINE__,LOG_FATAL,_("This is a error. This line should not be executed.\n"));
  			}
  
--- 466,495 ----
  		if(raw_policyinfo->iPolicySeconds>1) {
  			dps=t-raw_policyinfo->iPolicySeconds;
! 			pp_log_fl(LOG_INFO,_("Purging raw data older than %s from service '%s', ServiceId %d due to "),
  				asctime(localtime(&dps)),raw_policyinfo->sServiceDesc,
  				raw_policyinfo->iServiceId);
  			switch(raw_policyinfo->iPolicySource) {
  				case DEL_POLICY_SOURCE_SERVICE:
! 					pp_log_fl(LOG_INFO,_("individual service setting\n"));
  				  break;
  				case DEL_POLICY_SOURCE_HOST:
! 					pp_log_fl(LOG_INFO,_("individual host setting\n"));
  				  break;
  				case DEL_POLICY_SOURCE_HOSTGROUP:
! 					pp_log_fl(LOG_INFO,_("individual hostgroup setting\n"));
  				  break;
  				case DEL_POLICY_SOURCE_SERVICE_GROUP:
! 					pp_log_fl(LOG_INFO,_("group '%s' setting in service.\n"),raw_policyinfo->sPolicyName);
  				  break;
  				case DEL_POLICY_SOURCE_HOST_GROUP:
! 					pp_log_fl(LOG_INFO,_("group '%s' setting in host.\n"),raw_policyinfo->sPolicyName);
  				  break;
  				case DEL_POLICY_SOURCE_HOSTGROUP_GROUP:
! 					pp_log_fl(LOG_INFO,_("group '%s' setting in hostgroup.\n"),raw_policyinfo->sPolicyName);
  				  break;
  				case DEL_POLICY_SOURCE_DEFAULT:
  					pp_log_fl(LOG_INFO,_("default setting.\n"));
  				default:
! 				  pp_log_fl(LOG_FATAL,_("This is a error. This line should not be executed.\n"));
  			}
  
***************
*** 499,503 ****
  
  		
! 	pp_log(__FILE__,__LINE__,LOG_DEBUG,"Closing mysql connection\n");
  	mysql_close(&db_mysql);
  }
--- 503,507 ----
  
  		
! 	pp_log_fl(LOG_DEBUG,"Closing mysql connection\n");
  	mysql_close(&db_mysql);
  }