Juju Charms Collection
was-nd package

Merge lp:~geethas1/charms/trusty/was-nd/wasnd-fix into lp:~ibmcharmers/charms/trusty/was-nd/devel

  1. Trusty Tahr (14.04)
  2. wasnd-fix
  3. Merge into devel
Proposed by Geetha S
Status: Superseded
Proposed branch: lp:~geethas1/charms/trusty/was-nd/wasnd-fix
Merge into: lp:~ibmcharmers/charms/trusty/was-nd/devel
Diff against target: 53 lines (+21/-10)
2 files modified
hooks/start (+11/-5)
hooks/stop (+10/-5)
To merge this branch: bzr merge lp:~geethas1/charms/trusty/was-nd/wasnd-fix
Reviewer Review Type Date Requested Status
vsr Pending
Review via email: mp+266076@code.launchpad.net

This proposal supersedes a proposal from 2015-07-24.

This proposal has been superseded by a proposal from 2015-07-29.

To post a comment you must log in.
lp:~geethas1/charms/trusty/was-nd/wasnd-fix updated
12. By Geetha S

Committing start/stop hook changes

13. By Geetha S

Committing reverse proxy test case

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/start'
2--- hooks/start 2015-07-18 07:42:47 +0000
3+++ hooks/start 2015-07-29 07:07:38 +0000
4@@ -6,13 +6,19 @@
5 if [ "$?" -eq "0" ];then
6 juju-log "IBM WASND: WAS ND Server already started"
7 else
8- cd $WAS_ND_INSTALL_PATH/profiles/test/bin/
9- sudo ./startServer.sh server1
10- if [ "$?" -ne "0" ]; then
11- juju-log "IBM WASND: Error while starting the server"
12+ if [ -d $WAS_BASE_INSTALL_PATH/profiles/test/bin ]; then
13+ cd $WAS_ND_INSTALL_PATH/profiles/test/bin/
14+ sudo ./startServer.sh server1
15+ if [ "$?" -ne "0" ]; then
16+ juju-log "IBM WASND: Error while starting the server"
17+ else
18+ juju-log "IBM WASND: Server started successfully"
19+ fi
20 else
21- juju-log "IBM WASND: Server started successfully"
22+ juju-log "IBM WAS ND: No server to start, exiting."
23+ exit 0
24 fi
25+
26 fi
27 open-port 9060
28 open-port 9443
29
30=== modified file 'hooks/stop'
31--- hooks/stop 2015-07-24 11:50:42 +0000
32+++ hooks/stop 2015-07-29 07:07:38 +0000
33@@ -3,10 +3,15 @@
34 set -e
35 WAS_ND_INSTALL_PATH=/root/IBM/WebSphere/AppServer/V85/ND
36
37-cd $WAS_ND_INSTALL_PATH/profiles/test/bin/
38-./stopServer.sh server1
39-if [ "$?" -ne "0" ]; then
40- juju-log "Error while stoping the server"
41+if [ -d $WAS_BASE_INSTALL_PATH/profiles/test/bin ]; then
42+ cd $WAS_ND_INSTALL_PATH/profiles/test/bin/
43+ ./stopServer.sh server1
44+ if [ "$?" -ne "0" ]; then
45+ juju-log "Error while stoping the server"
46+ else
47+ juju-log "Server stopped successfully"
48+ fi
49 else
50- juju-log "Server stopped successfully"
51+ juju-log "IBM WAS ND: No server to stop, exiting."
52+ exit 0
53 fi

Subscribers

People subscribed via source and target branches

to all changes: