Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
The Tor Project
Anti-censorship
Pluggable Transports
Snowflake
Commits
21e27d3b
Commit
21e27d3b
authored
Jan 20, 2017
by
David Fifield
Browse files
Use log.Fatalf instead of log.Printf + os.Exit in server.
parent
11f3bbe3
Changes
1
Hide whitespace changes
Inline
Side-by-side
server/server.go
View file @
21e27d3b
...
...
@@ -228,11 +228,11 @@ func main() {
flag
.
StringVar
(
&
logFilename
,
"log"
,
""
,
"log file to write to"
)
flag
.
Parse
()
log
.
SetFlags
(
log
.
LstdFlags
|
log
.
LUTC
)
if
logFilename
!=
""
{
f
,
err
:=
os
.
OpenFile
(
logFilename
,
os
.
O_CREATE
|
os
.
O_APPEND
|
os
.
O_WRONLY
,
0600
)
if
err
!=
nil
{
fmt
.
Fprintf
(
os
.
Stderr
,
"Can't open log file %q: %s.
\n
"
,
logFilename
,
err
.
Error
())
os
.
Exit
(
1
)
log
.
Fatalf
(
"Can't open log file %q: %s."
,
logFilename
,
err
.
Error
())
}
log
.
SetOutput
(
f
)
}
...
...
@@ -247,13 +247,11 @@ func main() {
}
}
log
.
SetFlags
(
log
.
LstdFlags
|
log
.
LUTC
)
log
.
Printf
(
"starting"
)
var
err
error
ptInfo
,
err
=
pt
.
ServerSetup
(
nil
)
if
err
!=
nil
{
log
.
Printf
(
"error in setup: %s"
,
err
)
os
.
Exit
(
1
)
log
.
Fatalf
(
"error in setup: %s"
,
err
)
}
listeners
:=
make
([]
net
.
Listener
,
0
)
...
...
Write
Preview
Supports
Markdown
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