Merge branch 'graceful-restarts' of https://github.com/jonas747/yagpdb …

…into graceful-restarts
galen8183 · Jul 11, 2018 · 08426bb · 08426bb
2 parents bcbf7b5 + 92c10a2
commit 08426bb
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/bot/discordevents.go b/bot/discordevents.go
@@ -47,6 +47,7 @@ func setWaitingGuildReady(g int64) {
 		stateLock.Lock()
 		currentState := state
 		stateLock.Unlock()
+
 		if currentState == StateSoftStarting {
 			SlaveClient.Send(master.EvtSoftStartComplete, nil, true)
 		}

diff --git a/master/slave/slave.go b/master/slave/slave.go
@@ -96,7 +96,6 @@ func (c *Conn) TryReconnect(running bool) bool {
 }
 
 func (c *Conn) HandleMessage(m *master.Message) {
-
 	dataInterfaceF, ok := master.EvtDataMap[m.EvtID]
 	var dataInterface interface{}
 	if ok {

diff --git a/master/slaveconn.go b/master/slaveconn.go
@@ -28,7 +28,6 @@ func NewSlaveConn(netConn net.Conn) *SlaveConn {
 		}
 		mu.Unlock()
 	}
-
 	return sc
 }
 
@@ -57,7 +56,6 @@ func (s *SlaveConn) HandleMessage(msg *Message) {
 	case EvtSlaveHello:
 		hello := dataInterface.(*SlaveHelloData)
 		s.HandleHello(hello)
-
 	// Full slave migration with shard rescaling not implemented yet
 	// case EvtSoftStartComplete:
 	// 	go mainSlave.Conn.Send(EvtShutdown, nil)
@@ -103,7 +101,6 @@ func (s *SlaveConn) HandleMessage(msg *Message) {
 		newSlave.Conn.Send(EvtGuildState, dataInterface)
 
 	}
-
 }
 
 func (s *SlaveConn) HandleHello(hello *SlaveHelloData) {