Skip to content
Snippets Groups Projects
Commit 69ffcc39 authored by Yawning Angel's avatar Yawning Angel
Browse files

Delay transport initialization till after logging has been setup.

parent cf4dd074
No related branches found
No related tags found
No related merge requests found
Changes in version 0.0.6 - UNRELEASED:
- Delay transport factory initialization till after logging has been
initialized.
Changes in version 0.0.5 - 2015-04-15:
- Go vet/fmt fixes, and misc. code cleanups. Patches by mvdan.
......
......@@ -347,6 +347,10 @@ func main() {
if err = log.Init(*enableLogging, path.Join(stateDir, obfs4proxyLogFile), *unsafeLogging); err != nil {
golog.Fatalf("[ERROR]: %s - failed to initialize logging", execName)
}
if err = transports.Init(); err != nil {
log.Errorf("%s - failed to initialize transports: %s", execName, err)
os.Exit(-1)
}
log.Noticef("%s - launched", getVersion())
......
......@@ -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
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment