Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
ansible
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
ansible
Commits
22dbb65b
Commit
22dbb65b
authored
Sep 11, 2014
by
James Cammarata
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move initscript rc check to later in service status check
Fixes #7284
parent
d9e0a5ed
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
9 deletions
+9
-9
library/system/service
+9
-9
No files found.
library/system/service
View file @
22dbb65b
...
...
@@ -542,15 +542,6 @@ class LinuxService(Service):
self
.
running
=
"started"
in
openrc_status_stdout
self
.
crashed
=
"crashed"
in
openrc_status_stderr
# if the job status is still not known check it by response code
# For reference, see:
# http://refspecs.linuxbase.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/iniscrptact.html
if
self
.
running
is
None
:
if
rc
in
[
1
,
2
,
3
,
4
,
69
]:
self
.
running
=
False
elif
rc
==
0
:
self
.
running
=
True
# if the job status is still not known check it by status output keywords
if
self
.
running
is
None
:
# first transform the status output that could irritate keyword matching
...
...
@@ -572,6 +563,15 @@ class LinuxService(Service):
elif
'dead but pid file exists'
in
cleanout
:
self
.
running
=
False
# if the job status is still not known check it by response code
# For reference, see:
# http://refspecs.linuxbase.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/iniscrptact.html
if
self
.
running
is
None
:
if
rc
in
[
1
,
2
,
3
,
4
,
69
]:
self
.
running
=
False
elif
rc
==
0
:
self
.
running
=
True
# if the job status is still not known check it by special conditions
if
self
.
running
is
None
:
if
self
.
name
==
'iptables'
and
"ACCEPT"
in
status_stdout
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment