From 90ef2645ae64e4edeb401430483281e4954a5a1f Mon Sep 17 00:00:00 2001 From: Marius Tolzmann Date: Fri, 18 Sep 2015 18:27:19 +0200 Subject: [PATCH 1/3] mxqd: Clean up setting initial TMPDIR clean up becb9faff6c8dd8d6715965b0200c7916c1efacc --- Makefile | 6 ++++-- mxqd.c | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index b692e42..696a558 100644 --- a/Makefile +++ b/Makefile @@ -62,11 +62,13 @@ CGIDIR = ${LIBEXECDIR}/mxq/cgi 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 +MXQ_INITIAL_PATH = /sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin +MXQ_INITIAL_TMPDIR = /tmp 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)\" +CFLAGS_MXQ_INITIAL_TMPDIR = -DMXQ_INITIAL_TMPDIR=\"$(MXQ_INITIAL_TMPDIR)\" MYSQL_CONFIG = mysql_config @@ -75,7 +77,7 @@ OS_RELEASE = $(shell ./os-release) # special defaults for mariux64 ifeq (${OS_RELEASE}, mariux64) MXQ_INITIAL_PATH := ${MXQ_INITIAL_PATH}:/usr/local/package/bin - CFLAGS_MXQ_INITIAL_TMPDIR = -DMXQ_INITIAL_TMPDIR=\"/scratch/local\" + MXQ_INITIAL_TMPDIR := /scratch/local endif ######################################################################## diff --git a/mxqd.c b/mxqd.c index 5a8eaf0..53c07ba 100644 --- a/mxqd.c +++ b/mxqd.c @@ -50,6 +50,10 @@ #define MYSQL_DEFAULT_FILE MXQ_MYSQL_DEFAULT_FILE #define MYSQL_DEFAULT_GROUP "mxqd" +#ifndef MXQ_INITIAL_TMPDIR +# define MXQ_INITIAL_TMPDIR "/tmp" +#endif + volatile sig_atomic_t global_sigint_cnt=0; volatile sig_atomic_t global_sigterm_cnt=0; @@ -779,9 +783,7 @@ static int init_child_process(struct mxq_group_list *group, struct mxq_job *j) mx_setenv_forever("USERNAME", g->user_name); mx_setenv_forever("LOGNAME", g->user_name); mx_setenv_forever("PATH", MXQ_INITIAL_PATH); -#ifdef MXQ_INITIAL_TMPDIR - mx_setenv_forever("TMPDIR", MXQ_INITIAL_TMPDIR); -#endif + mx_setenv_forever("TMPDIR", MXQ_INITIAL_TMPDIR); mx_setenv_forever("PWD", j->job_workdir); mx_setenv_forever("HOME", passwd->pw_dir); mx_setenv_forever("SHELL", passwd->pw_shell); From ec090afddfd020bc72d7869d1492f002a53bde32 Mon Sep 17 00:00:00 2001 From: Marius Tolzmann Date: Mon, 21 Sep 2015 10:21:35 +0200 Subject: [PATCH 2/3] mxqd: Define default for MXQ_INITIAL_PATH in mxqd.c --- mxqd.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mxqd.c b/mxqd.c index 53c07ba..c2b572d 100644 --- a/mxqd.c +++ b/mxqd.c @@ -50,6 +50,10 @@ #define MYSQL_DEFAULT_FILE MXQ_MYSQL_DEFAULT_FILE #define MYSQL_DEFAULT_GROUP "mxqd" +#ifndef MXQ_INITIAL_PATH +# define MXQ_INITIAL_PATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" +#endif + #ifndef MXQ_INITIAL_TMPDIR # define MXQ_INITIAL_TMPDIR "/tmp" #endif From e974e79ea5e74fab7c549b210f9c3af12d0074d6 Mon Sep 17 00:00:00 2001 From: Marius Tolzmann Date: Mon, 21 Sep 2015 10:33:57 +0200 Subject: [PATCH 3/3] mxqd: Use mysql defaults from mxq.h --- mxqd.c | 37 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/mxqd.c b/mxqd.c index c2b572d..6d4c340 100644 --- a/mxqd.c +++ b/mxqd.c @@ -34,18 +34,7 @@ #include "mxq_job.h" #include "mx_mysql.h" #include "mxqd.h" - -#ifndef MXQ_VERSION -#define MXQ_VERSION "0.00" -#endif - -#ifndef MXQ_VERSIONFULL -#define MXQ_VERSIONFULL "MXQ v0.00 super alpha 0" -#endif - -#ifndef MXQ_VERSIONDATE -#define MXQ_VERSIONDATE "2015" -#endif +#include "mxq.h" #define MYSQL_DEFAULT_FILE MXQ_MYSQL_DEFAULT_FILE #define MYSQL_DEFAULT_GROUP "mxqd" @@ -63,22 +52,13 @@ volatile sig_atomic_t global_sigterm_cnt=0; int mxq_redirect_output(char *stdout_fname, char *stderr_fname); -static void print_version(void) -{ - printf( - "mxqd - " MXQ_VERSIONFULL "\n" - " by Marius Tolzmann " MXQ_VERSIONDATE "\n" - " Max Planck Institute for Molecular Genetics - Berlin Dahlem\n" - ); -} - static void print_usage(void) { - print_version(); + mxq_print_generic_version(); printf( "\n" "Usage:\n" - " mxqd [options]\n" + " %s [options]\n" "\n" "options:\n" " -j, --slots default: 1\n" @@ -98,13 +78,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 ); } @@ -280,7 +263,7 @@ int server_init(struct mxq_server *server, int argc, char *argv[]) break; case 'V': - print_version(); + mxq_print_generic_version(); exit(EX_USAGE); case 'h':