Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
synapse
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maunium
synapse
Commits
9ceb4f08
Commit
9ceb4f08
authored
5 years ago
by
Erik Johnston
Browse files
Options
Downloads
Patches
Plain Diff
Fix --no-daemonize flag for synctl
parent
b4914681
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
synctl
+6
-6
6 additions, 6 deletions
synctl
with
6 additions
and
6 deletions
synctl
+
6
−
6
View file @
9ceb4f08
...
@@ -150,8 +150,9 @@ def main():
...
@@ -150,8 +150,9 @@ def main():
parser
.
add_argument
(
parser
.
add_argument
(
"
--no-daemonize
"
,
"
--no-daemonize
"
,
action
=
"
store_false
"
,
action
=
"
store_false
"
,
dest
=
"
daemonize
"
,
help
=
"
Run synapse in the foreground for debugging.
"
help
=
"
Run synapse in the foreground for debugging.
"
"
Will work only if the daemonize option is not set in the config.
"
"
Will work only if the daemonize option is not set in the config.
"
,
)
)
options
=
parser
.
parse_args
()
options
=
parser
.
parse_args
()
...
@@ -159,7 +160,7 @@ def main():
...
@@ -159,7 +160,7 @@ def main():
if
options
.
worker
and
options
.
all_processes
:
if
options
.
worker
and
options
.
all_processes
:
write
(
'
Cannot use
"
--worker
"
with
"
--all-processes
"'
,
stream
=
sys
.
stderr
)
write
(
'
Cannot use
"
--worker
"
with
"
--all-processes
"'
,
stream
=
sys
.
stderr
)
sys
.
exit
(
1
)
sys
.
exit
(
1
)
if
options
.
no_
daemonize
and
options
.
all_processes
:
if
not
options
.
daemonize
and
options
.
all_processes
:
write
(
'
Cannot use
"
--no-daemonize
"
with
"
--all-processes
"'
,
stream
=
sys
.
stderr
)
write
(
'
Cannot use
"
--no-daemonize
"
with
"
--all-processes
"'
,
stream
=
sys
.
stderr
)
sys
.
exit
(
1
)
sys
.
exit
(
1
)
...
@@ -169,9 +170,8 @@ def main():
...
@@ -169,9 +170,8 @@ def main():
write
(
write
(
"
No config file found
\n
"
"
No config file found
\n
"
"
To generate a config file, run
'
%s -c %s --generate-config
"
"
To generate a config file, run
'
%s -c %s --generate-config
"
"
--server-name=<server name> --report-stats=<yes/no>
'
\n
"
%
(
"
--server-name=<server name> --report-stats=<yes/no>
'
\n
"
"
"
.
join
(
SYNAPSE
),
options
.
configfile
,
%
(
"
"
.
join
(
SYNAPSE
),
options
.
configfile
),
),
stream
=
sys
.
stderr
,
stream
=
sys
.
stderr
,
)
)
sys
.
exit
(
1
)
sys
.
exit
(
1
)
...
@@ -289,7 +289,7 @@ def main():
...
@@ -289,7 +289,7 @@ def main():
# Check if synapse is already running
# Check if synapse is already running
if
os
.
path
.
exists
(
pidfile
)
and
pid_running
(
int
(
open
(
pidfile
).
read
())):
if
os
.
path
.
exists
(
pidfile
)
and
pid_running
(
int
(
open
(
pidfile
).
read
())):
abort
(
"
synapse.app.homeserver already running
"
)
abort
(
"
synapse.app.homeserver already running
"
)
start
(
configfile
,
bool
(
options
.
no_
daemonize
))
start
(
configfile
,
bool
(
options
.
daemonize
))
for
worker
in
workers
:
for
worker
in
workers
:
env
=
os
.
environ
.
copy
()
env
=
os
.
environ
.
copy
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment