Ticket #5508: twisted_ssh_less_noisy.diff

twisted/conch/ssh/transport.py

@@ -536 +536 @@
             self.sendDisconnect(DISCONNECT_KEY_EXCHANGE_FAILED,
                                 "couldn't match all kex parts")
             return
-        log.msg('kex alg, key alg: %s %s' % (self.kexAlg, self.keyAlg))
-        log.msg('outgoing: %s %s %s' % (self.nextEncryptions.outCipType,
-                                        self.nextEncryptions.outMACType,
-                                        self.outgoingCompressionType))
-        log.msg('incoming: %s %s %s' % (self.nextEncryptions.inCipType,
-                                        self.nextEncryptions.inMACType,
-                                        self.incomingCompressionType))
 
         if self._keyExchangeState == self._KEY_EXCHANGE_REQUESTED:
             self._keyExchangeState = self._KEY_EXCHANGE_PROGRESSING
@@ -606 +599 @@
 
         @type service: C{SSHService}
         """
-        log.msg('starting service %s' % service.name)
         if self.service:
             self.service.serviceStopped()
         self.service = service
@@ -705 +697 @@
         outs = [initIVSC, encKeySC, integKeySC]
         ins = [initIVCS, encKeyCS, integKeyCS]
         if self.isClient: # reverse for the client
-            log.msg('REVERSE')
             outs, ins = ins, outs
         self.nextEncryptions.setKeys(outs[0], outs[1], ins[0], ins[1],
                                      outs[2], ins[2])
@@ -719 +710 @@
         and compression parameters should be adopted.  Any messages which were
         queued during key exchange will also be flushed.
         """
-        log.msg('NEW KEYS')
         self.currentEncryptions = self.nextEncryptions
         if self.outgoingCompressionType == 'zlib':
             self.outgoingCompression = zlib.compressobj(6)

twisted/conch/ssh/connection.py

@@ -238 +238 @@
         if channel.localWindowLeft < channel.localWindowSize / 2:
             self.adjustWindow(channel, channel.localWindowSize - \
                                        channel.localWindowLeft)
-            #log.msg('local window left: %s/%s' % (channel.localWindowLeft,
-            #                                    channel.localWindowSize))
         log.callWithLogger(channel, channel.dataReceived, data)
 
     def ssh_CHANNEL_EXTENDED_DATA(self, packet):
@@ -407 +405 @@
         @type channel:  subclass of C{SSHChannel}
         @type extra:    C{str}
         """
-        log.msg('opening channel %s with %s %s'%(self.localChannelID,
-                channel.localWindowSize, channel.localMaxPacket))
         self.transport.sendPacket(MSG_CHANNEL_OPEN, common.NS(channel.name)
                     + struct.pack('>3L', self.localChannelID,
                     channel.localWindowSize, channel.localMaxPacket)
@@ -429 +425 @@
         """
         if channel.localClosed:
             return
-        log.msg('sending request %s' % requestType)
         self.transport.sendPacket(MSG_CHANNEL_REQUEST, struct.pack('>L',
                                     self.channelsToRemoteChannel[channel])
                                   + common.NS(requestType)+chr(wantReply)
@@ -494 +489 @@
         """
         if channel.localClosed:
             return # we're already closed
-        log.msg('sending eof')
         self.transport.sendPacket(MSG_CHANNEL_EOF, struct.pack('>L',
                                     self.channelsToRemoteChannel[channel]))
 
@@ -506 +500 @@
         """
         if channel.localClosed:
             return # we're already closed
-        log.msg('sending close %i' % channel.id)
         self.transport.sendPacket(MSG_CHANNEL_CLOSE, struct.pack('>L',
                 self.channelsToRemoteChannel[channel]))
         channel.localClosed = True

twisted/conch/ssh/userauth.py

@@ -144 +144 @@
             if it failed.
         @rtype: C{defer.Deferred}
         """
-        log.msg('%s trying auth %s' % (user, kind))
         if kind not in self.supportedAuthentications:
             return defer.fail(
                     error.ConchError('unsupported authentication, failing'))
@@ -523 +522 @@
                               if meth not in self.authenticatedWith],
                              key=orderByPreference)
 
-        log.msg('can continue with: %s' % canContinue)
         return self._cbUserauthFailure(None, iter(canContinue))
 
 
@@ -685 +683 @@
         if publicKey is not None:
             self.lastPublicKey = publicKey
             self.triedPublicKeys.append(publicKey)
-            log.msg('using key of type %s' % publicKey.type())
             self.askForAuth('publickey', '\x00' + NS(publicKey.sshType()) +
                             NS(publicKey.blob()))
             return True