Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Snowflake
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Analyze
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
trinity-1686a
Snowflake
Commits
00e8415d
Verified
Commit
00e8415d
authored
3 years ago
by
shelikhoo
Browse files
Options
Downloads
Patches
Plain Diff
Add verbosity switch to suppress diagnostic output
parent
e828b060
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
proxy/lib/pt_event_logger.go
+6
-3
6 additions, 3 deletions
proxy/lib/pt_event_logger.go
proxy/main.go
+12
-6
12 additions, 6 deletions
proxy/main.go
with
18 additions
and
9 deletions
proxy/lib/pt_event_logger.go
+
6
−
3
View file @
00e8415d
...
...
@@ -2,14 +2,16 @@ package snowflake_proxy
import
(
"git.torproject.org/pluggable-transports/snowflake.git/v2/common/task"
"io"
"log"
"time"
"git.torproject.org/pluggable-transports/snowflake.git/v2/common/event"
)
func
NewProxyEventLogger
(
logPeriod
time
.
Duration
)
event
.
SnowflakeEventReceiver
{
el
:=
&
logEventLogger
{
logPeriod
:
logPeriod
}
func
NewProxyEventLogger
(
logPeriod
time
.
Duration
,
output
io
.
Writer
)
event
.
SnowflakeEventReceiver
{
logger
:=
log
.
New
(
output
,
""
,
log
.
LstdFlags
|
log
.
LUTC
)
el
:=
&
logEventLogger
{
logPeriod
:
logPeriod
,
logger
:
logger
}
el
.
task
=
&
task
.
Periodic
{
Interval
:
logPeriod
,
Execute
:
el
.
logTick
}
el
.
task
.
Start
()
return
el
...
...
@@ -21,6 +23,7 @@ type logEventLogger struct {
connectionCount
int
logPeriod
time
.
Duration
task
*
task
.
Periodic
logger
*
log
.
Logger
}
func
(
p
*
logEventLogger
)
OnNewSnowflakeEvent
(
e
event
.
SnowflakeEvent
)
{
...
...
@@ -36,7 +39,7 @@ func (p *logEventLogger) OnNewSnowflakeEvent(e event.SnowflakeEvent) {
func
(
p
*
logEventLogger
)
logTick
()
error
{
inbound
,
inboundUnit
:=
formatTraffic
(
p
.
inboundSum
)
outbound
,
outboundUnit
:=
formatTraffic
(
p
.
inboundSum
)
log
.
Printf
(
"In the last %v, there are %v connections. Traffic Relayed ↑ %v %v, ↓ %v %v.
\n
"
,
p
.
log
ger
.
Printf
(
"In the last %v, there are %v connections. Traffic Relayed ↑ %v %v, ↓ %v %v.
\n
"
,
p
.
logPeriod
.
String
(),
p
.
connectionCount
,
inbound
,
inboundUnit
,
outbound
,
outboundUnit
)
p
.
outboundSum
=
0
p
.
inboundSum
=
0
...
...
This diff is collapsed.
Click to expand it.
proxy/main.go
+
12
−
6
View file @
00e8415d
...
...
@@ -4,6 +4,7 @@ import (
"flag"
"git.torproject.org/pluggable-transports/snowflake.git/v2/common/event"
"io"
"io/ioutil"
"log"
"os"
"time"
...
...
@@ -24,15 +25,12 @@ func main() {
"the time interval in second before NAT type is retested, 0s disables retest. Valid time units are
\"
s
\"
,
\"
m
\"
,
\"
h
\"
. "
)
SummaryInterval
:=
flag
.
Duration
(
"summary-interval"
,
time
.
Hour
,
"the time interval to output summary, 0s disables retest. Valid time units are
\"
s
\"
,
\"
m
\"
,
\"
h
\"
. "
)
verboseLogging
:=
flag
.
Bool
(
"verbose"
,
false
,
"increase log verbosity"
)
flag
.
Parse
()
periodicEventLogger
:=
sf
.
NewProxyEventLogger
(
*
SummaryInterval
)
eventLogger
:=
event
.
NewSnowflakeEventDispatcher
()
eventLogger
.
AddSnowflakeEventListener
(
periodicEventLogger
)
proxy
:=
sf
.
SnowflakeProxy
{
Capacity
:
uint
(
*
capacity
),
STUNURL
:
*
stunURL
,
...
...
@@ -45,16 +43,21 @@ func main() {
}
var
logOutput
io
.
Writer
=
os
.
Stderr
var
eventlogOutput
io
.
Writer
=
os
.
Stderr
log
.
SetFlags
(
log
.
LstdFlags
|
log
.
LUTC
)
log
.
SetFlags
(
log
.
LstdFlags
|
log
.
LUTC
)
if
!*
verboseLogging
{
logOutput
=
ioutil
.
Discard
}
if
*
logFilename
!=
""
{
f
,
err
:=
os
.
OpenFile
(
*
logFilename
,
os
.
O_CREATE
|
os
.
O_WRONLY
|
os
.
O_APPEND
,
0600
)
if
err
!=
nil
{
log
.
Fatal
(
err
)
}
defer
f
.
Close
()
logOutput
=
io
.
MultiWriter
(
os
.
Stderr
,
f
)
logOutput
=
io
.
MultiWriter
(
logOutput
,
f
)
eventlogOutput
=
io
.
MultiWriter
(
eventlogOutput
,
f
)
}
if
*
unsafeLogging
{
log
.
SetOutput
(
logOutput
)
...
...
@@ -62,6 +65,9 @@ func main() {
log
.
SetOutput
(
&
safelog
.
LogScrubber
{
Output
:
logOutput
})
}
periodicEventLogger
:=
sf
.
NewProxyEventLogger
(
*
SummaryInterval
,
eventlogOutput
)
eventLogger
.
AddSnowflakeEventListener
(
periodicEventLogger
)
err
:=
proxy
.
Start
()
if
err
!=
nil
{
log
.
Fatal
(
err
)
...
...
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