Merge lp:~mfoord/juju-core/ha-rsyslog-shortcut-removal into lp:~go-bot/juju-core/trunk

[Michael Foord]

[Michael Foord (mfoord)]

Done as part of: https://code.launchpad.net/~mfoord/juju-core/ha-rsyslog-good/+merge/220669

Unmerged revisions

2748. By Michael Foord on 2014-05-19

Remove obsolete test

2747. By Michael Foord on 2014-05-19

Remove obsolete check

2746. By Michael Foord on 2014-05-19

Merge from wwitzel3

=== modified file 'worker/rsyslog/rsyslog_test.go'
--- worker/rsyslog/rsyslog_test.go	2014-05-19 16:37:24 +0000
+++ worker/rsyslog/rsyslog_test.go	2014-05-19 16:37:24 +0000
@@ -238,42 +238,3 @@
 	c.Assert(names, gc.HasLen, 1)
 	c.Assert(names[0], gc.Equals, expectedFilename)
 }
-
-func (s *RsyslogSuite) TestConfigChange(c *gc.C) {
-	var restarted bool
-	s.PatchValue(rsyslog.RestartRsyslog, func() error {
-		restarted = true
-		return nil
-	})
-
-	st, m := s.OpenAPIAsNewMachine(c, state.JobHostUnits)
-	handler, err := rsyslog.NewRsyslogConfigHandler(st.Rsyslog(), rsyslog.RsyslogModeForwarding, m.Tag(), "", []string{"0.1.2.3"})
-	c.Assert(err, gc.IsNil)
-
-	assertRestart := func(v bool) {
-		err := handler.Handle()
-		c.Assert(err, gc.IsNil)
-		c.Assert(restarted, gc.Equals, v)
-		restarted = false
-		// Handling again should not restart, as no changes have been made.
-		err = handler.Handle()
-		c.Assert(err, gc.IsNil)
-		c.Assert(restarted, jc.IsFalse)
-	}
-
-	err = s.APIState.Client().EnvironmentSet(map[string]interface{}{"rsyslog-ca-cert": coretesting.CACert})
-	c.Assert(err, gc.IsNil)
-	assertRestart(true)
-
-	err = s.APIState.Client().EnvironmentSet(map[string]interface{}{"syslog-port": 1})
-	c.Assert(err, gc.IsNil)
-	assertRestart(true)
-
-	err = s.APIState.Client().EnvironmentSet(map[string]interface{}{"unrelated": "anything"})
-	c.Assert(err, gc.IsNil)
-	assertRestart(false)
-
-	err = s.APIState.Client().EnvironmentSet(map[string]interface{}{"syslog-port": 2})
-	c.Assert(err, gc.IsNil)
-	assertRestart(true)
-}

=== modified file 'worker/rsyslog/worker.go'
--- worker/rsyslog/worker.go	2014-05-19 16:37:24 +0000
+++ worker/rsyslog/worker.go	2014-05-19 16:37:24 +0000
@@ -147,11 +147,6 @@
 	if rsyslogCACert == "" {
 		return nil
 	}
-	// If neither syslog-port nor rsyslog-ca-cert
-	// have changed, we can drop out now.
-	if cfg.Port == h.syslogPort && rsyslogCACert == h.rsyslogCACert {
-		return nil
-	}
 	h.syslogConfig.Port = cfg.Port
 	if h.mode == RsyslogModeForwarding {
 		if err := writeFileAtomic(h.syslogConfig.CACertPath(), []byte(rsyslogCACert), 0644, 0, 0); err != nil {