mxqsub: Improve handling of mysql config defaults

mariux · May 21, 2015 · c225c25 · c225c25
1 parent 5f95040
commit c225c25
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -46,11 +46,14 @@ endif
 
 ##############################################################################
 
-MXQ_MYSQL_DEFAULT_FILE = ${SYSCONFDIR}/mxq/mysql.cnf
+MXQ_MYSQL_DEFAULT_FILE  = ${SYSCONFDIR}/mxq/mysql.cnf
+MXQ_MYSQL_DEFAULT_GROUP = mxqclient
+
 MXQ_INITIAL_PATH = /sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
 
-CFLAGS_MXQ_MYSQL_DEFAULT_FILE = -DMXQ_MYSQL_DEFAULT_FILE=\"$(MXQ_MYSQL_DEFAULT_FILE)\"
-CFLAGS_MXQ_INITIAL_PATH       = -DMXQ_INITIAL_PATH=\"$(MXQ_INITIAL_PATH)\"
+CFLAGS_MXQ_MYSQL_DEFAULT_FILE  = -DMXQ_MYSQL_DEFAULT_FILE=\"$(MXQ_MYSQL_DEFAULT_FILE)\"
+CFLAGS_MXQ_MYSQL_DEFAULT_GROUP = -DMXQ_MYSQL_DEFAULT_GROUP=\"$(MXQ_MYSQL_DEFAULT_GROUP)\"
+CFLAGS_MXQ_INITIAL_PATH        = -DMXQ_INITIAL_PATH=\"$(MXQ_INITIAL_PATH)\"
 
 MYSQL_CONFIG = mysql_config
 
@@ -347,6 +350,7 @@ mxqsub.o: $(mxq_job.h)
 mxqsub.o: $(mxq_util.h)
 mxqsub.o: CFLAGS += $(CFLAGS_MYSQL)
 mxqsub.o: CFLAGS += $(CFLAGS_MXQ_MYSQL_DEFAULT_FILE)
+mxqsub.o: CFLAGS += $(CFLAGS_MXQ_MYSQL_DEFAULT_GROUP)
 
 clean: CLEAN += mxqsub.o
 

diff --git a/mxq.h b/mxq.h
@@ -57,10 +57,6 @@ struct mxq_job_full {
     struct rusage  stats_rusage;
 };
 
-#ifndef MXQ_MYSQL_DEFAULT_FILE
-#define MXQ_MYSQL_DEFAULT_FILE NULL
-#endif
-
 struct mxq_job_full_list {
     struct mxq_job_full_list_item *first;
     struct mxq_job_full_list_item *last;

diff --git a/mxqsub.c b/mxqsub.c
@@ -54,8 +54,18 @@
 #define MXQ_VERSIONDATE "2015"
 #endif
 
-#define MYSQL_DEFAULT_FILE     MXQ_MYSQL_DEFAULT_FILE
-#define MYSQL_DEFAULT_GROUP    "mxqsub"
+#ifndef MXQ_MYSQL_DEFAULT_FILE
+#   define MXQ_MYSQL_DEFAULT_FILE NULL
+#   define MXQ_MYSQL_DEFAULT_FILE_STR "\"MySQL defaults\""
+#else
+#   define MXQ_MYSQL_DEFAULT_FILE_STR MXQ_MYSQL_DEFAULT_FILE
+#endif
+
+#ifndef MXQ_MYSQL_DEFAULT_GROUP
+#   define MXQ_MYSQL_DEFAULT_GROUP     program_invocation_short_name
+#endif
+#define MXQ_MYSQL_DEFAULT_GROUP_STR MXQ_MYSQL_DEFAULT_GROUP
+
 
 static void print_version(void)
 {
@@ -72,7 +82,7 @@ static void print_usage(void)
     printf(
     "\n"
     "Usage:\n"
-    "  mxqsub [mxqsub-options] <command> [command options and arguments ..]\n"
+    "  %s [mxqsub-options] <command> [command options and arguments ..]\n"
     "\n"
     "Synopsis:\n"
     "  queue a job to be executed on a cluster node.\n"
@@ -115,13 +125,16 @@ static void print_usage(void)
     "\n"
     "Change how to connect to the mysql server:\n"
     "\n"
-    "  -M | --mysql-default-file  [mysql-file]   (default: " MYSQL_DEFAULT_FILE ")\n"
-    "  -S | --mysql-default-group [mysql-group]  (default: " MYSQL_DEFAULT_GROUP ")\n"
+    "  -M | --mysql-default-file  [mysql-file]   (default: %s)\n"
+    "  -S | --mysql-default-group [mysql-group]  (default: %s)\n"
     "\n"
     "Environment:\n"
     "  MXQ_MYSQL_DEFAULT_FILE   change default for [mysql-file]\n"
     "  MXQ_MYSQL_DEFAULT_GROUP  change default for [mysql-group]\n"
-    "\n"
+    "\n",
+        program_invocation_short_name,
+        MXQ_MYSQL_DEFAULT_FILE_STR,
+        MXQ_MYSQL_DEFAULT_GROUP_STR
     );
 }
 
@@ -481,11 +494,11 @@ int main(int argc, char *argv[])
 
     arg_mysql_default_group = getenv("MXQ_MYSQL_DEFAULT_GROUP");
     if (!arg_mysql_default_group)
-        arg_mysql_default_group = MYSQL_DEFAULT_GROUP;
+        arg_mysql_default_group = MXQ_MYSQL_DEFAULT_GROUP;
 
     arg_mysql_default_file  = getenv("MXQ_MYSQL_DEFAULT_FILE");
     if (!arg_mysql_default_file)
-        arg_mysql_default_file = MYSQL_DEFAULT_FILE;
+        arg_mysql_default_file = MXQ_MYSQL_DEFAULT_FILE;
 
     /******************************************************************/