From afe03abb09f856ec4a7511a6b849845e8082d284 Mon Sep 17 00:00:00 2001
From: Victor Muzychenko <mzkvct@gmail.com>
Date: Wed, 22 Mar 2017 13:18:54 +0300
Subject: [PATCH] replace logger.debug by logger.info

---
 scripts/add_keys.py  | 14 +++++++-------
 scripts/load_test.py | 19 ++++++++++---------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/scripts/add_keys.py b/scripts/add_keys.py
index 75823aac0..6bd513daf 100644
--- a/scripts/add_keys.py
+++ b/scripts/add_keys.py
@@ -50,19 +50,19 @@ def spawnClient(clientName, port, signerSeed, host='0.0.0.0'):
 
 async def checkReply(client, requestId):
     _, status = client.getReply(requestId)
-    logger.debug("Number of received messages {}".format(len(client.inBox)))
+    logger.info("Number of received messages {}".format(len(client.inBox)))
     groups = groupby(client.inBox, key=lambda x: x[0])
     for key, group in groups:
-        logger.debug("Group {}".format(key['op']))
+        logger.info("Group {}".format(key['op']))
         for msg in list(group):
-            logger.debug("  {}".format(msg))
+            logger.info("  {}".format(msg))
     succeeded = status == "CONFIRMED"
     return succeeded
 
 
 async def doRequesting(client, wallet, op):
     signedOp = wallet.signOp(op)
-    logger.debug("Client {} sending request {}".format(client, op))
+    logger.info("Client {} sending request {}".format(client, op))
     request = client.submitReqs(signedOp)[0]
     requestId = request.reqId
     args = [client, requestId]
@@ -73,9 +73,9 @@ def checkIfConnectedToAll(client):
     connectedNodes = client.nodestack.connecteds
     connectedNodesNum = len(connectedNodes)
     totalNodes = len(client.nodeReg)
-    logger.debug("Connected {} / {} nodes".format(connectedNodesNum, totalNodes))
+    logger.info("Connected {} / {} nodes".format(connectedNodesNum, totalNodes))
     for node in connectedNodes:
-        logger.debug("  {}".format(node))
+        logger.info("  {}".format(node))
 
     if connectedNodesNum == 0:
         raise Exception("Not connected to any")
@@ -87,7 +87,7 @@ def checkIfConnectedToAll(client):
 
 async def ensureConnectedToNodes(client):
     wait = 5
-    logger.debug("waiting for {} seconds to check client connections to nodes...".format(wait))
+    logger.info("waiting for {} seconds to check client connections to nodes...".format(wait))
     await eventuallyAll(lambda : checkIfConnectedToAll(client), retryWait=.5, totalTimeout=wait)
 
 
diff --git a/scripts/load_test.py b/scripts/load_test.py
index 1486ce29b..438299115 100644
--- a/scripts/load_test.py
+++ b/scripts/load_test.py
@@ -34,7 +34,8 @@
 logger = getlogger()
 config = getConfig()
 
-TTL = 5.0
+TTL = 60.0
+CONNECTION_TTL = 30.0
 RETRY_WAIT = 0.25
 
 
@@ -135,7 +136,7 @@ def submitNym(self):
                            verkey=signer.verkey)
             wallet.addSponsoredIdentity(idy)
             reqs = wallet.preparePending()
-            logger.debug("Client {} sending request {}".format(cli, reqs[0]))
+            logger.info("Client {} sending request {}".format(cli, reqs[0]))
             sentAt = time.time()
             cli.submitReqs(reqs[0])
             corosArgs.append([cli, wallet, reqs[0], sentAt])
@@ -150,7 +151,7 @@ def submitSetAttr(self):
                                ledgerStore=LedgerStore.RAW)
             wallet.addAttribute(attrib)
             reqs = wallet.preparePending()
-            logger.debug("Client {} sending request {}".format(cli, reqs[0]))
+            logger.info("Client {} sending request {}".format(cli, reqs[0]))
             sentAt = time.time()
             cli.submitReqs(reqs[0])
             corosArgs.append([cli, wallet, reqs[0], sentAt])
@@ -236,7 +237,7 @@ async def checkReplyAndLogStat(client, wallet, request, sentAt, writeResultsRow,
                     ackNodes=",".join(ackNodes),
                     nackNodes=",".join(nackNodes.keys()),
                     replyNodes=",".join(replyNodes.keys()))
-    logger.debug("COUNTER {}".format(row))
+    logger.info("COUNTER {}".format(row))
     stats.append((latency, hasConsensus, queryTime))
     writeResultsRow(row._asdict())
 
@@ -245,7 +246,7 @@ def checkIfConnectedToAll(client):
     connectedNodes = client.nodestack.connecteds
     connectedNodesNum = len(connectedNodes)
     totalNodes = len(client.nodeReg)
-    logger.debug("Connected {} / {} nodes".
+    logger.info("Connected {} / {} nodes".
                  format(connectedNodesNum, totalNodes))
 
     if connectedNodesNum == 0:
@@ -287,7 +288,7 @@ def printCurrentTestResults(stats, testStartedAt):
     failNum = totalNum - successNum
     throughput = successNum / secSinceTestStart
     errRate = failNum / secSinceTestStart
-    logger.debug(
+    logger.info(
         """
         ================================
         Test time: {}
@@ -310,7 +311,7 @@ def main(args):
         "perf_results_{x.numberOfClients}_" \
         "{x.numberOfRequests}_{0}.csv".format(int(time.time()), x=args)
     resultFilePath = os.path.join(args.resultsPath, resultsFileName)
-    logger.debug("Results file: {}".format(resultFilePath))
+    logger.info("Results file: {}".format(resultFilePath))
 
     def writeResultsRow(row):
         if not os.path.exists(resultFilePath):
@@ -344,7 +345,7 @@ def buildCoros(coroFunc, corosArgs):
             looper.add(cli)
             connectionCoros.append(functools.partial(checkIfConnectedToAll, cli))
         looper.run(eventuallyAll(*connectionCoros,
-                                 totalTimeout=TTL,
+                                 totalTimeout=CONNECTION_TTL,
                                  retryWait=RETRY_WAIT))
 
         testStartedAt = time.time()
@@ -369,7 +370,7 @@ def buildCoros(coroFunc, corosArgs):
                                      totalTimeout=len(coros)*TTL,
                                      retryWait=RETRY_WAIT))
             printCurrentTestResults(stats, testStartedAt)
-        logger.debug("Sent {} {} requests".format(len(coros), requestType))
+        logger.info("Sent {} {} requests".format(len(coros), requestType))
 
 
 if __name__ == '__main__':