Merge lp:~clint-fewbar/charms/precise/memcached/trunk into lp:charms/memcached

Proposed by Clint Byrum
Status: Merged
Merged at revision: 50
Proposed branch: lp:~clint-fewbar/charms/precise/memcached/trunk
Merge into: lp:charms/memcached
Diff against target: 24 lines (+10/-1)
2 files modified
hooks/cache-relation-joined (+8/-1)
hooks/config-changed (+2/-0)
To merge this branch: bzr merge lp:~clint-fewbar/charms/precise/memcached/trunk
Reviewer Review Type Date Requested Status
Juan L. Negron (community) Approve
Review via email: mp+124280@code.launchpad.net

Description of the change

Some fixes for things I noticed while reviewing the charm.

To post a comment you must log in.
Revision history for this message
Juan L. Negron (negronjl) wrote :

Reviewing this now.

-Juan

Revision history for this message
Juan L. Negron (negronjl) wrote :

Approved.

-Juan

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/cache-relation-joined'
2--- hooks/cache-relation-joined 2011-06-15 23:56:16 +0000
3+++ hooks/cache-relation-joined 2012-09-13 18:46:19 +0000
4@@ -1,2 +1,9 @@
5 #!/bin/sh
6-relation-set host=`hostname -f` port=11211
7+if [ -z "$JUJU_RELATION_ID" ] ; then
8+ rids=$(relation-ids cache)
9+else
10+ rids=$JUJU_RELATION_ID
11+fi
12+for $rid in $rids ; do
13+ relation-set -r $rid host=`unit-get private-address` port=`config-get tcp-port` udp-port=`config-get udp-port`
14+done
15
16=== modified file 'hooks/config-changed'
17--- hooks/config-changed 2011-12-05 22:55:46 +0000
18+++ hooks/config-changed 2012-09-13 18:46:19 +0000
19@@ -151,3 +151,5 @@
20 if [ $udp_port -gt 0 ] ; then
21 open-port $udp_port/UDP
22 fi
23+# In case port changed, inform consumers
24+hooks/cache-relation-joined

Subscribers

People subscribed via source and target branches

to all changes: