From 5738b0ef6d96b784ab0db543957fd272e6328f90 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Wed, 22 Sep 2010 21:11:09 +0000
Subject: [PATCH] add: make --show-updater-queue work with startup script fix:
make --version work correctly
SVN: 17989
---
datastore_server/dist/datastore_server.sh | 5 ++++-
.../systemsx/cisd/openbis/dss/generic/DataStoreServer.java | 7 +++++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/datastore_server/dist/datastore_server.sh b/datastore_server/dist/datastore_server.sh
index 2a4618f375d..2eb2fffd0f7 100755
--- a/datastore_server/dist/datastore_server.sh
+++ b/datastore_server/dist/datastore_server.sh
@@ -242,11 +242,14 @@ case "$command" in
show-shredder)
${JAVA_BIN} ${ALL_JAVA_OPTS} -jar $JAR_FILE --show-shredder
;;
+ show-updater-queue)
+ ${JAVA_BIN} ${ALL_JAVA_OPTS} -jar $JAR_FILE --show-updater-queue
+ ;;
show-command-queue)
${JAVA_BIN} ${ALL_JAVA_OPTS} -jar $JAR_FILE --show-command-queue
;;
*)
- echo $"Usage: $0 {start|stop|restart|status|help|version|show-shredder|show-command-queue}"
+ echo $"Usage: $0 {start|stop|restart|status|help|version|show-shredder|show-updater-queue|show-command-queue}"
exit 200
;;
esac
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/DataStoreServer.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/DataStoreServer.java
index e39698e7538..3aa9afa3726 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/DataStoreServer.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/DataStoreServer.java
@@ -26,6 +26,7 @@ import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.common.logging.LogInitializer;
import ch.systemsx.cisd.common.spring.SpringEoDSQLExceptionTranslator;
import ch.systemsx.cisd.etlserver.ETLDaemon;
+import ch.systemsx.cisd.openbis.dss.BuildAndEnvironmentInfo;
import ch.systemsx.cisd.openbis.dss.generic.server.CommandQueueLister;
import ch.systemsx.cisd.openbis.dss.generic.shared.QueueingDataSetStatusUpdaterService;
@@ -68,6 +69,12 @@ public class DataStoreServer
public static void main(String[] args)
{
+ if (args[0].equals("--version"))
+ {
+ System.err
+ .println("Data Store Server version " + BuildAndEnvironmentInfo.INSTANCE.getFullVersion());
+ System.exit(0);
+ }
initLog();
final boolean showShredder = (args.length > 0 && args[0].equals("--show-shredder"));
if (showShredder)
--
GitLab