]> Sergey Matveev's repositories - btrtrc.git/commitdiff
DHT node table should be loaded after the server is initialized
authorMatt Joiner <anacrolix@gmail.com>
Tue, 24 Jun 2014 13:17:06 +0000 (23:17 +1000)
committerMatt Joiner <anacrolix@gmail.com>
Tue, 24 Jun 2014 13:17:06 +0000 (23:17 +1000)
cmd/dht-server/main.go

index 4b7cf8abf49c9bcc45a98dab04bdb079ef64b005..b18dfc46bda217d38062985f259745aaf656eacc 100644 (file)
@@ -60,10 +60,7 @@ func loadTable() error {
 func init() {
        log.SetFlags(log.LstdFlags | log.Lshortfile)
        flag.Parse()
-       err := loadTable()
-       if err != nil {
-               log.Fatalf("error loading table: %s", err)
-       }
+       var err error
        s.Socket, err = net.ListenUDP("udp4", func() *net.UDPAddr {
                addr, err := net.ResolveUDPAddr("udp4", *serveAddr)
                if err != nil {
@@ -74,8 +71,12 @@ func init() {
        if err != nil {
                log.Fatal(err)
        }
-       log.Printf("dht server on %s", s.Socket.LocalAddr())
        s.Init()
+       err = loadTable()
+       if err != nil {
+               log.Fatalf("error loading table: %s", err)
+       }
+       log.Printf("dht server on %s, ID is %q", s.Socket.LocalAddr(), s.IDString())
        setupSignals()
 }