summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-01-11 21:37:28 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-01-11 21:37:28 +0100
commita991a5d8865c9b4c058d1900e8c4a07a09f31081 (patch)
treee375baff9d81764f14d61f49843db5be9855cf3e
parent4366a268eef0dcb1cc823596add73c83d2984914 (diff)
downloadserverdata-a991a5d8865c9b4c058d1900e8c4a07a09f31081.tar.gz
serverdata-a991a5d8865c9b4c058d1900e8c4a07a09f31081.tar.bz2
serverdata-a991a5d8865c9b4c058d1900e8c4a07a09f31081.tar.xz
serverdata-a991a5d8865c9b4c058d1900e8c4a07a09f31081.zip
eathena.sh and eathena-monitor corrections
When the monitor didn't find the configuration, it didn't print out the path it actually tried. The shell script was modified to actually pass the path to the configuration to the monitor, otherwise it can't find this itself when the 'workdir' doesn't match its default value.
-rw-r--r--eathena-monitor.c2
-rwxr-xr-xeathena.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/eathena-monitor.c b/eathena-monitor.c
index 3ab7f0f2..8e9d985c 100644
--- a/eathena-monitor.c
+++ b/eathena-monitor.c
@@ -79,7 +79,7 @@ int read_config(char *filename) {
int errors = 0;
if ( !(input = fopen(filename,"r")) && !(input = fopen (config, "r"))) {
- fprintf (stderr, "ERROR: Config file doesn't exist (%s and %s), using builtin defaults\n",filename,CONFIG);
+ fprintf (stderr, "ERROR: Config file doesn't exist (%s and %s), using builtin defaults\n", filename, config);
return -1;
}
diff --git a/eathena.sh b/eathena.sh
index edfabf9c..31c3a860 100755
--- a/eathena.sh
+++ b/eathena.sh
@@ -20,7 +20,7 @@ cd ${SRVHOMEDIR}
eathena_start() {
if [ -x ${SRVHOMEDIR}/eathena-monitor ];
then echo "Starting eathena monitor..."
- ${SRVHOMEDIR}/eathena-monitor
+ ${SRVHOMEDIR}/eathena-monitor ${SRVHOMEDIR}/conf/eathena-monitor.conf
else echo "Eathena monitor binary is not executable or not found."
fi
}