← Back to branch summary

~ubuntu-branches/ubuntu/saucy/cinder/saucy

« back to all changes in this revision

Viewing changes to cinder/wsgi.py

  • Committer: Package Import Robot
  • Author(s): James Page, Chuck Short, Adam Gandelman, James Page
  • Date: 2013-07-19 14:14:40 UTC
  • mfrom: (1.1.17)
  • Revision ID: package-import@ubuntu.com-20130719141440-brarmy8wxm3vosaf
Tags: 1:2013.2~b2-0ubuntu1
[ Chuck Short ]
* debian/patches/avoid_paramiko_vers_depends.patch: Refreshed
* debian/control: Add missing testrepostory.
* debian/rules: Use testr directly.

[ Adam Gandelman ]
* debian/control:
  - Add minimum requirement python-anyjson (>= 0.3.3).
  - Add minimum requirement python-keystoneclient (>= 0.2.3).
  - Add minimum requirement python-kombu (>= 2.5.12).

[ James Page ]
* New upstream release.
* d/control: Update VCS fields for new branch locations.
* d/rules: Run unit tests in parallel.

Show diffs side-by-side

added added

removed removed

Lines of Context:
cinder/wsgi.py
19
19
 
20
20
"""Utility methods for working with WSGI servers."""
21
21
 
 
22
 
22
23
import errno
23
24
import os
24
25
import socket
36
37
import webob.exc
37
38
 
38
39
from cinder import exception
39
 
from cinder import flags
40
40
from cinder.openstack.common import log as logging
41
41
from cinder import utils
42
42
 
 
43
 
43
44
socket_opts = [
44
45
    cfg.IntOpt('backlog',
45
46
               default=4096,
65
66
CONF = cfg.CONF
66
67
CONF.register_opts(socket_opts)
67
68
 
68
 
FLAGS = flags.FLAGS
69
69
LOG = logging.getLogger(__name__)
70
70
 
71
71
 
155
155
                if use_ssl:
156
156
                    sock = wrap_ssl(sock)
157
157
 
158
 
            except socket.error, err:
 
158
            except socket.error as err:
159
159
                if err.args[0] != errno.EADDRINUSE:
160
160
                    raise
161
161
                eventlet.sleep(0.1)
475
475
        :returns: None
476
476
 
477
477
        """
478
 
        config_path = config_path or FLAGS.api_paste_config
 
478
        config_path = config_path or CONF.api_paste_config
479
479
        self.config_path = utils.find_config(config_path)
480
480
 
481
481
    def load_app(self, name):