hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

additional checks for object and schema triggers

Browse Source 
minor bug fixes in consumer.c
This commit is contained in:
Markus Makela
2014-09-03 18:35:20 +03:00
parent 89a2d1d4c7
commit 13f63ab92b
2 changed files with 13 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rabbitmq_consumer/CMakeLists.txt
View File

@ -20,9 +20,6 @@ link_directories(${CMAKE_SOURCE_DIR}/inih)
if(RABBITMQ_C_LIBRARIES AND MYSQL_LIBRARIES AND MYSQL_INCLUDE_DIRS) if(RABBITMQ_C_LIBRARIES AND MYSQL_LIBRARIES AND MYSQL_INCLUDE_DIRS)
add_definitions(-DCONFIG_IN_ETC)
add_definitions(-DCONSUMER_CONFIG_PREFIX="${CMAKE_INSTALL_PREFIX}/share/consumer")
add_executable (consumer consumer.c ${MYSQL_LIBRARIES} ${RABBITMQ_C_LIBRARIES}) add_executable (consumer consumer.c ${MYSQL_LIBRARIES} ${RABBITMQ_C_LIBRARIES})
target_link_libraries(consumer mysqlclient) target_link_libraries(consumer mysqlclient)
target_link_libraries(consumer rabbitmq) target_link_libraries(consumer rabbitmq)

40
rabbitmq_consumer/consumer.c
View File

@ -12,15 +12,6 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#ifdef CONFIG_IN_ETC
#define CONFIG 1
#else
#define CONFIG 0
#endif
#ifndef CONSUMER_CONFIG_PREFIX
#define CONSUMER_CONFIG_PREFIX "/usr/share/consumer"
#endif
typedef struct delivery_t typedef struct delivery_t
{ {
@ -346,7 +337,11 @@ int main(int argc, char** argv)
MYSQL db_inst; MYSQL db_inst;
char ch, *cnfname = NULL, *cnfpath = NULL; char ch, *cnfname = NULL, *cnfpath = NULL;
static const char* fname = "consumer.cnf"; static const char* fname = "consumer.cnf";
static const char* fprefix = CONSUMER_CONFIG_PREFIX;
if((c_inst = calloc(1,sizeof(CONSUMER))) == NULL){
fprintf(stderr, "Fatal Error: Cannot allocate enough memory.\n");
return 1;
}
if(signal(SIGINT,sighndl) == SIG_IGN){ if(signal(SIGINT,sighndl) == SIG_IGN){
signal(SIGINT,SIG_IGN); signal(SIGINT,SIG_IGN);
@ -374,16 +369,7 @@ int main(int argc, char** argv)
strcat(cnfname,"/"); strcat(cnfname,"/");
} }
}else if(CONFIG){ }
/**Config file location was set at install*/
strcat(cnfname,fprefix);
if(cnfname[strlen(cnfname) - 1] != '/'){
strcat(cnfname,"/");
}
}
strcat(cnfname,fname); strcat(cnfname,fname);
@ -392,17 +378,14 @@ int main(int argc, char** argv)
all_ok = 1; all_ok = 1;
out_fd = NULL; out_fd = NULL;
if((c_inst = calloc(1,sizeof(CONSUMER))) == NULL){
fprintf(stderr, "Fatal Error: Cannot allocate enough memory.\n");
return 1;
}
/**Parse the INI file*/ /**Parse the INI file*/
if(ini_parse(cnfname,handler,NULL) < 0){ if(ini_parse(cnfname,handler,NULL) < 0){
/**Try to parse a config in the same directory*/ /**Try to parse a config in the same directory*/
if(ini_parse(fname,handler,NULL) < 0){ if(ini_parse(fname,handler,NULL) < 0){
fprintf(out_fd, "Fatal Error: Error parsing configuration file!\n"); fprintf(stderr, "Fatal Error: Error parsing configuration file!\n");
goto fatal_error; goto fatal_error;
} }
@ -514,8 +497,11 @@ int main(int argc, char** argv)
amqp_connection_close(conn, AMQP_REPLY_SUCCESS); amqp_connection_close(conn, AMQP_REPLY_SUCCESS);
amqp_destroy_connection(conn); amqp_destroy_connection(conn);
fatal_error: fatal_error:
fclose(out_fd); if(out_fd){
fclose(out_fd);
}
if(c_inst){ if(c_inst){