server.go

@@ -205,7 +205,6 @@ type server struct {
 	started       int32
 	shutdown      int32
 	shutdownSched int32
-	startupTime   int64
 
 	chainParams          *chaincfg.Params
 	addrManager          *addrmgr.AddrManager
@@ -2373,9 +2372,6 @@ func (s *server) Start() {
 
 	srvrLog.Trace("Starting server")
 
-	// Server startup time. Used for the uptime command for uptime calculation.
-	s.startupTime = time.Now().Unix()
-
 	// Start the peer handler which in turn starts the address and block
 	// managers.
 	s.wg.Add(1)
@@ -2633,6 +2629,8 @@ func newServer(listenAddrs, agentBlacklist, agentWhitelist []string,
 	db database.DB, chainParams *chaincfg.Params,
 	interrupt <-chan struct{}) (*server, error) {
 
+	startupTime := time.Now()
+
 	services := defaultServices
 	if cfg.NoPeerBloomFilters {
 		services &^= wire.SFNodeBloom
@@ -2950,7 +2948,7 @@ func newServer(listenAddrs, agentBlacklist, agentWhitelist []string,
 
 		s.rpcServer, err = newRPCServer(&rpcserverConfig{
 			Listeners:    rpcListeners,
-			StartupTime:  s.startupTime,
+			StartupTime:  startupTime.Unix(),
 			ConnMgr:      &rpcConnManager{&s},
 			AddrMgr:      amgr,
 			SyncMgr:      &rpcSyncMgr{&s, s.syncManager},