From 69ffcc39c63f4a9a192082da71eea6b06a1e75d7 Mon Sep 17 00:00:00 2001 From: Yawning Angel Date: Mon, 1 Jun 2015 16:15:35 +0000 Subject: Delay transport initialization till after logging has been setup. --- transports/transports.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'transports') diff --git a/transports/transports.go b/transports/transports.go index ba4e099..e35673b 100644 --- a/transports/transports.go +++ b/transports/transports.go @@ -41,7 +41,7 @@ import ( ) var transportMapLock sync.Mutex -var transportMap map[string]base.Transport +var transportMap map[string]base.Transport = make(map[string]base.Transport) // Register registers a transport protocol. func Register(transport base.Transport) error { @@ -81,13 +81,12 @@ func Get(name string) base.Transport { return t } -func init() { - // Initialize the transport list. - transportMap = make(map[string]base.Transport) - - // Register all the currently supported transports. +// Init initializes all of the integrated transports. +func Init() error { Register(new(obfs2.Transport)) Register(new(obfs3.Transport)) Register(new(obfs4.Transport)) Register(new(scramblesuit.Transport)) + + return nil } -- cgit v1.2.3