Merge lp:~hopem/nova/juno-sru-lp1459046 into lp:~ubuntu-server-dev/nova/juno

[Edward Hope-Morley]

[lp:~hopem/nova/juno-sru-lp1459046]

725. By Edward Hope-Morley on 2015-07-15

adjust dch

726. By Edward Hope-Morley on 2015-07-15

rm name

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-06 11:06:22 +0000
+++ debian/changelog	2015-07-15 16:42:02 +0000
@@ -1,3 +1,10 @@
+nova (1:2014.2.3-0ubuntu1.2) UNRELEASED; urgency=medium
+
+  * Add rsyslog retry support (LP: #1459046)
+    - d/p/add-support-for-syslog-connect-retries.patch
+
+ -- Edward Hope-Morley <[e-mail]>  Wed, 15 Jul 2015 18:10:02 +0200
+
 nova (1:2014.2.3-0ubuntu1.1) utopic; urgency=medium
 
   * d/nova-compute.upstart: Fix (another) race between nova-compute

=== added file 'debian/patches/add-support-for-syslog-connect-retries.patch'
--- debian/patches/add-support-for-syslog-connect-retries.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/add-support-for-syslog-connect-retries.patch	2015-07-15 16:42:02 +0000
@@ -0,0 +1,98 @@
+From 11bbcad50acacb4a7c36c38cc486e64332022ac1 Mon Sep 17 00:00:00 2001
+From: Edward Hope-Morley <[e-mail]>
+Date: Thu, 18 Jun 2015 13:38:58 +0100
+Subject: [PATCH] Add support for syslog connect retries
+
+If we have requested logging to syslog and syslog is
+not yet ready we shoudl allow for retry attempts. This
+patch provides a new option syslog-connect-retries to
+allow for retries with a 5 second interval between
+each retry.
+
+Closes-Bug: 1459046
+
+Change-Id: I3e5e892ce68a15f783a7d8a1a1fd56f6a53dd0ad
+Co-authored-by: Liang Chen <[e-mail]>
+---
+ nova/openstack/common/log.py | 49 ++++++++++++++++++++++++++++++++++----------
+ 1 file changed, 38 insertions(+), 11 deletions(-)
+
+diff --git a/nova/openstack/common/log.py b/nova/openstack/common/log.py
+index 5b8c685..36274c5 100644
+--- a/nova/openstack/common/log.py
++++ b/nova/openstack/common/log.py
+@@ -35,6 +35,7 @@ import logging.handlers
+ import os
+ import socket
+ import sys
++import time
+ import traceback
+ 
+ from oslo.config import cfg
+@@ -103,6 +104,10 @@ logging_cli_opts = [
+                 help='Use syslog for logging. '
+                      'Existing syslog format is DEPRECATED during I, '
+                      'and will change in J to honor RFC5424.'),
++    cfg.IntOpt('syslog-connect-retries',
++               default=3,
++               help='Number of attempts with a five second interval to retry '
++                    'connecting to syslog. (if use-syslog=True)'),
+     cfg.BoolOpt('use-syslog-rfc-format',
+                 # TODO(bogdando) remove or use True after existing
+                 #    syslog format deprecation in J
+@@ -544,19 +549,41 @@ def _setup_logging_from_conf(project, version):
+             logger.setLevel(level_name)
+ 
+     if CONF.use_syslog:
+-        try:
+-            facility = _find_facility_from_conf()
+-            # TODO(bogdando) use the format provided by RFCSysLogHandler
+-            #   after existing syslog format deprecation in J
+-            if CONF.use_syslog_rfc_format:
+-                syslog = RFCSysLogHandler(facility=facility)
++        retries = CONF.syslog_connect_retries
++        syslog_ready = False
++        while True:
++            try:
++                facility = _find_facility_from_conf()
++                # TODO(bogdando) use the format provided by RFCSysLogHandler
++                #   after existing syslog format deprecation in J
++                if CONF.use_syslog_rfc_format:
++                    syslog = RFCSysLogHandler(facility=facility)
++                else:
++                    syslog = logging.handlers.SysLogHandler(facility=facility)
++                log_root.addHandler(syslog)
++                syslog_ready = True
++            except socket.error:
++                if CONF.syslog_connect_retries <= 0:
++                    log_root.error(_('Connection to syslog failed and no '
++                                     'retry attempts requested'))
++                    break
++
++                if retries:
++                    log_root.info(_('Connection to syslog failed - '
++                                    'retrying in 5 seconds'))
++                    retries -= 1
++                else:
++                    log_root.error(_('Connection to syslog failed and '
++                                     'max retry attempts reached'))
++                    break
++
++                time.sleep(5)
+             else:
+-                syslog = logging.handlers.SysLogHandler(facility=facility)
+-            log_root.addHandler(syslog)
+-        except socket.error:
+-            log_root.error('Unable to add syslog handler. Verify that syslog'
+-                           'is running.')
++                break
+ 
++        if not syslog_ready:
++            log_root.error(_('Unable to add syslog handler. Verify that '
++                             'syslog is running.'))
+ 
+ _loggers = {}
+ 
+-- 
+1.9.1
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-12-05 19:59:54 +0000
+++ debian/patches/series	2015-07-15 16:42:02 +0000
@@ -5,3 +5,4 @@
 skip-ubuntu-tests.patch
 disable-websockify-tests.patch
 neutron-floating-ip-list.patch
+add-support-for-syslog-connect-retries.patch