Skip to content

Commit

Permalink
replaced restheart with RESTHeart in log message
Browse files Browse the repository at this point in the history
artifactid is RESTHeart
  • Loading branch information
ujibang committed Nov 15, 2014
1 parent fe4ffc4 commit ef698f0
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions bin/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
pid=`ps ax | grep "java -server -jar" | grep '[r]esth' | awk 'NR==1{print $1}' | cut -d' ' -f1`
echo $pid
if [ -n "${pid}" ]; then
echo restheart is already running
echo RESTHeart is already running
else
echo "starting restheart"
echo "starting RESTHeart"
java -server -jar $DIR/../target/restheart.jar $DIR/../etc/restheart-integrationtest.yml &
sleep 5
fi
4 changes: 2 additions & 2 deletions bin/stop.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

pid=`ps ax | grep "java -server -jar" | grep '[r]esth' | awk 'NR==1{print $1}' | cut -d' ' -f1`
if [ -n "${pid}" ]; then
echo stopping restheart: process pid is $pid
echo stopping RESTHeart: process pid is $pid
kill $pid
else
echo restheart is not running
echo RESTHeart is not running
fi
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.softinstigate</groupId>
<artifactId>restheart</artifactId>
<artifactId>RESTHeart</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Restheart</name>
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/com/softinstigate/restheart/Bootstrapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -162,14 +162,14 @@ public static void main(final String[] args) {
try {
start();
} catch (Throwable t) {
logger.error("error starting restheart. exiting..", t);
logger.error("error starting RESTHeart. exiting..", t);
System.exit(-2);
}

Runtime.getRuntime().addShutdownHook(new Thread() {
@Override
public void run() {
logger.info("restheart stopping");
logger.info("stopping RESTHeart");
logger.info("waiting for pending request to complete (up to 1 minute)");

try {
Expand Down Expand Up @@ -204,7 +204,7 @@ public void run() {
}
);

logger.info("restheart stopped");
logger.info("RESTHeart stopped");
}
});

Expand All @@ -219,7 +219,7 @@ public void run() {
logger.info("logging to console with level {}", conf.getLogLevel());
}

logger.info("restheart started **********************************************");
logger.info("RESTHeart started **********************************************");
}

private static void start() {
Expand Down Expand Up @@ -302,13 +302,13 @@ private static void start() {
}
}
} catch (KeyManagementException | NoSuchAlgorithmException | KeyStoreException | CertificateException | UnrecoverableKeyException ex) {
logger.error("couldn't start restheart, error with specified keystore. exiting..", ex);
logger.error("couldn't start RESTHeart, error with specified keystore. exiting..", ex);
System.exit(-1);
} catch (FileNotFoundException ex) {
logger.error("couldn't start restheart, keystore file not found. exiting..", ex);
logger.error("couldn't start RESTHeart, keystore file not found. exiting..", ex);
System.exit(-1);
} catch (IOException ex) {
logger.error("couldn't start restheart, error reading the keystore file. exiting..", ex);
logger.error("couldn't start RESTHeart, error reading the keystore file. exiting..", ex);
System.exit(-1);
}

Expand Down

0 comments on commit ef698f0

Please sign in to comment.