summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2015-07-28 10:48:32 -0400
committerScott Moser <smoser@ubuntu.com>2015-07-28 10:48:32 -0400
commit0a581732a40ff814b1fc0dace9f519b7a5c779e6 (patch)
tree86c39a28d09e142fdadeefd549c4e9b4c17f40ca
parentc6e7fb1752a93ed534080adf0588e4c7cdd99071 (diff)
downloadvyos-cloud-init-0a581732a40ff814b1fc0dace9f519b7a5c779e6.tar.gz
vyos-cloud-init-0a581732a40ff814b1fc0dace9f519b7a5c779e6.zip
must declare proto of '@'
-rw-r--r--cloudinit/config/cc_rsyslog.py6
-rw-r--r--tests/unittests/test_handler/test_handler_rsyslog.py6
2 files changed, 7 insertions, 5 deletions
diff --git a/cloudinit/config/cc_rsyslog.py b/cloudinit/config/cc_rsyslog.py
index 2bb00728..5ecf1629 100644
--- a/cloudinit/config/cc_rsyslog.py
+++ b/cloudinit/config/cc_rsyslog.py
@@ -251,6 +251,8 @@ class SyslogRemotesLine(object):
match = "*.*"
self.name = name
self.match = match
+ if not proto:
+ proto = "udp"
if proto == "@":
proto = "udp"
elif proto == "@@":
@@ -281,9 +283,9 @@ class SyslogRemotesLine(object):
def __str__(self):
buf = self.match + " "
if self.proto == "udp":
- buf += " @"
+ buf += "@"
elif self.proto == "tcp":
- buf += " @@"
+ buf += "@@"
if ":" in self.addr:
buf += "[" + self.addr + "]"
diff --git a/tests/unittests/test_handler/test_handler_rsyslog.py b/tests/unittests/test_handler/test_handler_rsyslog.py
index e7666615..7bfa65a9 100644
--- a/tests/unittests/test_handler/test_handler_rsyslog.py
+++ b/tests/unittests/test_handler/test_handler_rsyslog.py
@@ -128,13 +128,13 @@ class TestParseRemotesLine(t_help.TestCase):
def test_valid_ipv6(self):
r = parse_remotes_line("*.* [::1]")
- self.assertEqual("*.* [::1]", str(r))
+ self.assertEqual("*.* @[::1]", str(r))
def test_valid_ipv6_with_port(self):
r = parse_remotes_line("*.* [::1]:100")
self.assertEqual(r.port, 100)
self.assertEqual(r.addr, "::1")
- self.assertEqual("*.* [::1]:100", str(r))
+ self.assertEqual("*.* @[::1]:100", str(r))
def test_invalid_multiple_colon(self):
with self.assertRaises(ValueError):
@@ -142,7 +142,7 @@ class TestParseRemotesLine(t_help.TestCase):
def test_name_in_string(self):
r = parse_remotes_line("syslog.host", name="foobar")
- self.assertEqual("*.* syslog.host # foobar", str(r))
+ self.assertEqual("*.* @syslog.host # foobar", str(r))
class TestRemotesToSyslog(t_help.TestCase):