From eed89937bdf8509bdbeaf6fb642e9b8f90a87de3 Mon Sep 17 00:00:00 2001 From: Artur Troian Date: Fri, 20 Jul 2018 23:56:37 +0300 Subject: [PATCH] Cleanup commented code Signed-off-by: Artur Troian --- clients/sessions.go | 13 +++++++------ connection/connection.go | 8 +------- dockerBuild.sh | 3 +-- server/volantmq.go | 14 -------------- topics/types/types.go | 18 +----------------- transport/connTCP.go | 15 --------------- 6 files changed, 10 insertions(+), 61 deletions(-) diff --git a/clients/sessions.go b/clients/sessions.go index d9eec00..2febf02 100644 --- a/clients/sessions.go +++ b/clients/sessions.go @@ -400,6 +400,8 @@ func (m *Manager) newSession(cn connection.Initial, params *connection.ConnectPa if cn.Acknowledge(ack, connection.KeepAlive(keepAlive)) { ses.start() + + // TODO(troian): add remote address status := &systree.ClientConnectStatus{ Username: string(params.Username), Timestamp: time.Now().Format(time.RFC3339), @@ -407,12 +409,11 @@ func (m *Manager) newSession(cn connection.Initial, params *connection.ConnectPa MaximumPacketSize: params.MaxTxPacketSize, GeneratedID: params.IDGen, SessionPresent: ack.SessionPresent(), - //Address: cn.RemoteAddr().String(), - KeepAlive: uint16(keepAlive), - ConnAckCode: ack.ReturnCode(), - Protocol: params.Version, - CleanSession: params.CleanStart, - Durable: params.Durable, + KeepAlive: uint16(keepAlive), + ConnAckCode: ack.ReturnCode(), + Protocol: params.Version, + CleanSession: params.CleanStart, + Durable: params.Durable, } m.Systree.Clients().Connected(params.ID, status) diff --git a/connection/connection.go b/connection/connection.go index 477ecfb..a2b15c4 100644 --- a/connection/connection.go +++ b/connection/connection.go @@ -113,8 +113,6 @@ type DisconnectParams struct { Packets persistence.PersistedPackets } -//type onDisconnect func(*DisconnectParams) - // Callbacks provided by sessions manager to signal session state type Callbacks struct { // OnStop called when session stopped net connection and should be either suspended or deleted @@ -779,9 +777,6 @@ func (s *impl) onPublish(pkt *mqttp.Publish) (mqttp.IFace, error) { // - ignore the message but send acks // - return error leading to disconnect // TODO: publish permissions - //if status := s.ACL(s.ID, pkt.Topic(), auth.AccessTypeWrite); status == auth.StatusDeny { - // reason = mqttp.CodeAdministrativeAction - //} switch pkt.QoS() { case mqttp.QoS2: @@ -822,14 +817,13 @@ func (s *impl) onPublish(pkt *mqttp.Publish) (mqttp.IFace, error) { case mqttp.QoS0: // QoS 0 // [MQTT-4.3.1] // [MQTT-4.3.2-4] - // if reason < mqttp.CodeUnspecifiedError { + // TODO(troian): ignore if publish permissions not validated if err = s.publishToTopic(pkt); err != nil { s.log.Error("Couldn't publish message", zap.String("ClientID", s.id), zap.Uint8("QoS", uint8(pkt.QoS())), zap.Error(err)) } - // } } return resp, err diff --git a/dockerBuild.sh b/dockerBuild.sh index 260a46f..ac1a76a 100755 --- a/dockerBuild.sh +++ b/dockerBuild.sh @@ -9,5 +9,4 @@ fi docker build $buildArgs . echo "removing intermediate container" -docker rmi -f $(docker images -q --filter label=stage=intermediate) -#docker rmi $(docker images --filter "dangling=true" -q --no-trunc) \ No newline at end of file +docker rmi -f $(docker images -q --filter label=stage=intermediate) \ No newline at end of file diff --git a/server/volantmq.go b/server/volantmq.go index 0ac77e5..7ccdfb1 100644 --- a/server/volantmq.go +++ b/server/volantmq.go @@ -125,20 +125,6 @@ func NewServer(config Config) (Server, error) { return nil, err } - //generateNodeID := func() string { - // return uuid.New() + "@volantmq.io" - //} - - //if systemState.NodeName == "" || s.RewriteNodeName { - // if s.NodeName == "" { - // s.NodeName = generateNodeID() - // } - // - // systemState.NodeName = s.NodeName - //} else { - // s.NodeName = systemState.NodeName - //} - if err = systemPersistence.SetInfo(systemState); err != nil { return nil, err } diff --git a/topics/types/types.go b/topics/types/types.go index f3ca4cb..ac553f8 100644 --- a/topics/types/types.go +++ b/topics/types/types.go @@ -9,11 +9,6 @@ import ( "github.com/VolantMQ/volantmq/types" ) -//var ( -// // ErrUnknownProvider unknown provider -// ErrUnknownProvider = errors.New("Unknown provider") -//) - const ( // MWC is the multi-level wildcard MWC = "#" @@ -22,13 +17,7 @@ const ( SWC = "+" // SEP is the topic level separator - //SEP = "/" - - // SYS is the starting character of the system level topics - //SYS = "$" - - // Both wildcards - //BWC = "#+" + SEP = "/" ) var ( @@ -58,11 +47,6 @@ var ( // ErrNotFound object not found ErrNotFound = errors.New("topics: not found") - - // ErrNotOpen storage is not open - //ErrNotOpen = errors.New("not open") - - //ErrOverflow = errors.New("overflow") ) // Subscriber used inside each session as an object to provide to topic manager upon subscribe diff --git a/transport/connTCP.go b/transport/connTCP.go index 75d67e3..6fba7dd 100644 --- a/transport/connTCP.go +++ b/transport/connTCP.go @@ -12,8 +12,6 @@ import ( type connTCP struct { conn net.Conn stat systree.BytesMetric - //pollDesc - //timer *time.Timer } var _ Conn = (*connTCP)(nil) @@ -34,8 +32,6 @@ func (c *connTCP) Write(b []byte) (int, error) { } func (c *connTCP) Close() error { - //c.ePoll.Stop(c.desc) - //c.desc.Close() return c.conn.Close() } @@ -52,17 +48,6 @@ func (c *connTCP) SetDeadline(t time.Time) error { } func (c *connTCP) SetReadDeadline(t time.Time) error { - //if t.IsZero() && c.timer != nil { - // if !c.timer.Stop() { - // return errors.New("keepAlive expired") - // } - //} else { - // if c.timer == nil { - // c.timer = time.AfterFunc(t.Sub(time.Now()), c.keepAlive) - // } else { - // c.timer.Reset(t.Sub(time.Now())) - // } - //} return c.conn.SetReadDeadline(t) }