equal
deleted
inserted
replaced
|
1 In-house patch to fix glance-api to not respawn a new child when it knows it is |
|
2 terminating. This patch is Solaris specific and not necassarily suitable for |
|
3 upstream. |
|
4 |
|
5 --- glance-12.0.0/glance/common/wsgi.py.~2~ 2016-06-29 08:34:58.341184299 -0700 |
|
6 +++ glance-12.0.0/glance/common/wsgi.py 2016-06-29 08:35:31.903341381 -0700 |
|
7 @@ -359,7 +359,8 @@ class Server(object): |
|
8 pid, status = os.wait() |
|
9 if os.WIFEXITED(status) or os.WIFSIGNALED(status): |
|
10 self._remove_children(pid) |
|
11 - self._verify_and_respawn_children(pid, status) |
|
12 + if self.running: |
|
13 + self._verify_and_respawn_children(pid, status) |
|
14 except OSError as err: |
|
15 if err.errno not in (errno.EINTR, errno.ECHILD): |
|
16 raise |