Merge lp:~niedbalski/charms/precise/rsyslog-forwarder-ha/fix-no-rel into lp:charms/rsyslog-forwarder-ha

[Jorge Niedbalski]

- If no relation data is available, then force a die(), otherwise add the server relation.

[Jorge Niedbalski (niedbalski)]

environment: local
machines:
  "0":
    agent-state: started
    agent-version: 1.20.5.1
    dns-name: localhost
    instance-id: localhost
    series: trusty
    state-server-member-status: has-vote
  "1":
    agent-state: started
    agent-version: 1.20.5.1
    dns-name: 10.0.3.160
    instance-id: niedbalski-local-machine-1
    series: trusty
    hardware: arch=amd64
  "2":
    agent-state: started
    agent-version: 1.20.5.1
    dns-name: 10.0.3.169
    instance-id: niedbalski-local-machine-2
    series: trusty
    hardware: arch=amd64
services:
  mysql:
    charm: cs:trusty/mysql-4
    exposed: false
    relations:
      cluster:
      - mysql
      juju-info:
      - rsyslog-forwarder-ha
    units:
      mysql/0:
        agent-state: started
        agent-version: 1.20.5.1
        machine: "1"
        public-address: 10.0.3.160
        subordinates:
          rsyslog-forwarder-ha/0:
            upgrading-from: local:trusty/rsyslog-forwarder-ha-0
            agent-state: started
            agent-version: 1.20.5.1
            public-address: 10.0.3.160
  rsyslog:
    charm: local:trusty/rsyslog-14
    exposed: false
    relations:
      aggregator:
      - rsyslog-forwarder-ha
    units:
      rsyslog/0:
        agent-state: started
        agent-version: 1.20.5.1
        machine: "2"
        open-ports:
        - 514/tcp
        - 514/udp
        public-address: 10.0.3.169
  rsyslog-forwarder-ha:
    charm: local:trusty/rsyslog-forwarder-ha-0
    exposed: false
    relations:
      juju-info:
      - mysql
      syslog:
      - rsyslog
    subordinate-to:
    - mysql

[lp:~niedbalski/charms/precise/rsyslog-forwarder-ha/fix-no-rel]

8. By Jorge Niedbalski on 2014-08-27

Moved readme to readme.md

[Matt Bruzek (mbruzek)]

+1 LGTM

review: Approve

=== renamed file 'README' => 'README.md'
--- README	2014-05-02 20:11:28 +0000
+++ README.md	2014-08-27 22:35:28 +0000
@@ -1,17 +1,24 @@
 # General
 
-This Charm provides support for adding a [rsyslog](http://www.rsyslog.org) forwarder listener to any service 
+This Charm provides support for adding a [rsyslog](http://www.rsyslog.org) forwarder listener to any service
 in addition this charm allows to have multiple rsyslog aggregators servers offering currently 2 replication
 modes ( fanout, failover ).
 
 # Usage method
 
-This is a subordinate charm, which means it requires to have a service to hook in.
+This is a subordinate charm, which means it requires to have a service to hook in. On this
+example we are going to deploy mysql
 
 ```shell
     juju deploy mysql
 ```
 
+Then you must deploy this charm
+
+```shell
+    juju deploy rsyslog-forwarder-ha
+```
+
 Once your service is running, you can relate this charm:
 
 ```shell
@@ -32,7 +39,7 @@
     juju add-relation rsyslog-forwarder-ha secondary
 ```
 
-By default the 'fanout' replication mode is going to be used, which means that all the 
+By default the 'fanout' replication mode is going to be used, which means that all the
 syslog messages will be forwarder to any aggregator server using UDP port 514.
 
 In you want to choose to failover mode, this will require that your current

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-05-02 19:55:18 +0000
+++ hooks/hooks.py	2014-08-27 22:35:28 +0000
@@ -142,10 +142,13 @@
 
 @hooks.hook()
 def syslog_relation_joined():
-    relation = relation_id()
+    try:
+        relation = relation_id()
+    except Exception as ex:
+        die("Cannot get syslog relation id: %s" % ex.message)
 
-    if Server.has_relation(relation_id):
-        die("Relation %s already exists" % relation_id)
+    if Server.has_relation(relation):
+        die("Relation %s already exists" % relation)
 
     server = Server(relation_id=relation,
                     remote_unit=remote_unit(),