LBRYCommunity/lbcd
1
0
Fork 0
Code Issues 17 Pull requests 4 Projects Releases 28 Packages Wiki Activity

[lbry] server: make uptime rpc return a real uptime

Browse source
This commit is contained in:
Alex Grintsvayg 2021-10-29 16:21:54 -04:00 committed by Roy Lee
parent 44dd82a9f5
commit 33328a3e93
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
server.go
View file

@ -203,7 +203,6 @@ type server struct {
started int32 started int32
shutdown int32 shutdown int32
shutdownSched int32 shutdownSched int32
startupTime int64
chainParams *chaincfg.Params chainParams *chaincfg.Params
addrManager *addrmgr.AddrManager addrManager *addrmgr.AddrManager
@ -2371,9 +2370,6 @@ func (s *server) Start() {
srvrLog.Trace("Starting server") 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 // Start the peer handler which in turn starts the address and block
// managers. // managers.
s.wg.Add(1) s.wg.Add(1)
@ -2631,6 +2627,8 @@ func newServer(listenAddrs, agentBlacklist, agentWhitelist []string,
db database.DB, chainParams *chaincfg.Params, db database.DB, chainParams *chaincfg.Params,
interrupt <-chan struct{}) (*server, error) { interrupt <-chan struct{}) (*server, error) {
startupTime := time.Now()
services := defaultServices services := defaultServices
if cfg.NoPeerBloomFilters { if cfg.NoPeerBloomFilters {
services &^= wire.SFNodeBloom services &^= wire.SFNodeBloom
@ -2937,7 +2935,7 @@ func newServer(listenAddrs, agentBlacklist, agentWhitelist []string,
s.rpcServer, err = newRPCServer(&rpcserverConfig{ s.rpcServer, err = newRPCServer(&rpcserverConfig{
Listeners: rpcListeners, Listeners: rpcListeners,
StartupTime: s.startupTime, StartupTime: startupTime.Unix(),
ConnMgr: &rpcConnManager{&s}, ConnMgr: &rpcConnManager{&s},
SyncMgr: &rpcSyncMgr{&s, s.syncManager}, SyncMgr: &rpcSyncMgr{&s, s.syncManager},
TimeSource: s.timeSource, TimeSource: s.timeSource,