Merge pull request #15 from deepeshmittal/master

Execution script display, text file view fixes, New Daytona logo and header, Handshake mechanism fixed, Test level logger added

Author: deepeshmittal

README.md

@@ -1,4 +1,4 @@
-# Daytona 
+# <img src="docs/img/daytona_dark_text.png" alt="Daytona" width="250px">
 
 Daytona is an application-agnostic framework for automated performance testing and analysis. Any performance testing script running on command line can be integrated into a Daytona framework for repeatable execution and methodical analysis.
 

Scheduler+Agent/action.py

@@ -3,7 +3,6 @@
 import subprocess
 import threading
 import common
-from common import CommunicationError
 import os
 import time
 import shutil
@@ -13,6 +12,7 @@
 import client
 import config
 import signal
+import envelope
 from logger import LOG
 
 lctx = None
@@ -243,6 +243,16 @@ def log(self, *args):
     lctx.debug(args)
 
 
+def scheduler_handshake(current_test):
+    cl = client.TCPClient(LOG.getLogger("clientlog", "Agent"))
+    env = envelope.DaytonaEnvelope()
+    ret = cl.send(current_test.serverip, current_test.serverport, env.construct("DAYTONA_HANDSHAKE", "handshake2"))
+    if ret == "SUCCESS":
+        return True
+    else:
+        return False
+
+
 def startMonitor(self, *args):
     (obj, command, params, actionID, sync) = (args[0], args[1], args[2], args[3], args[4])
 

Scheduler+Agent/envelope.py

@@ -2,16 +2,16 @@
 # -*- coding:cp949 -*-
 import uuid
 
-class DaytonaEnvelope():
-  #todo : write all members correctly
-  def __init__(self):
-    self.msgid = None
-    self.timestamp = None
-    self.host = None
 
-  def construct(self, command, data):
-    self.msgid = uuid.uuid4()
-    #todo : include security appid here/ hostip_name
-    return "DAYTONA_CMD:" + command + ":" + str(self.msgid) + ":" + data
+class DaytonaEnvelope:
+    # todo : write all members correctly
+    def __init__(self):
+        self.msgid = None
+        self.timestamp = None
+        self.host = None
 
+    def construct(self, command, data):
+        self.msgid = uuid.uuid4()
+        # todo : include security appid here/ hostip_name
+        return "DAYTONA_CMD:" + command + ":" + str(self.msgid) + ":" + data
 

Scheduler+Agent/logger.py

@@ -1,52 +1,65 @@
 #!/usr/bin/env python
 # -*- coding:cp949 -*-
-import glob
 import logging
 import logging.handlers
 
+
 class Singleton(type):
-  _instances = {}
+    _instances = {}
 
-  def __call__(cls, *args, **kwargs):
-    if cls not in cls._instances.keys():
-      cls._instances[cls] = super(Singleton, cls).__call__(*args, **kwargs)
-    return cls._instances[cls]
+    def __call__(cls, *args, **kwargs):
+        if cls not in cls._instances.keys():
+            cls._instances[cls] = super(Singleton, cls).__call__(*args, **kwargs)
+        return cls._instances[cls]
 
 
 class LOG(object):
-  __metaclass__ = Singleton
-
-  _loggers = {}
-
-  def __init__(self, *args, **kwargs):
-    pass
-
-  @staticmethod
-  def getLogger(name=None, ROLE=""):
-    name = name+ROLE
-    if name not in LOG._loggers.keys():
-      LOG_FILENAME =  ROLE + '_logging_rotatingfile.log'
-      logging.basicConfig(level=logging.DEBUG,
-          format='%(asctime)s %(threadName)-12s %(name)-16s %(levelname)-6s {%(filename)-12s %(lineno)-4d}  %(message)-100s',
-          datefmt='%m-%d %H:%M',
-          filename=LOG_FILENAME,
-          filemode='w')
-
-      # Add the log message handler to the logger
-      handler = logging.handlers.RotatingFileHandler(
-          LOG_FILENAME, maxBytes=1073741824, backupCount=2)
-
-      console = logging.StreamHandler()
-      formatter = logging.Formatter('%(asctime)s %(threadName)-14s %(name)-19s %(message)s')
-      console.setLevel(logging.INFO)
-      console.setFormatter(formatter)
-
-      formatter = logging.Formatter('%(asctime)s - %(name)16s - %(message)s')
-      LOG._loggers[name] = logging.getLogger(str(name))
-      LOG._loggers[name].setLevel(logging.DEBUG)
-      LOG._loggers[name].addHandler(handler)
-      handler.setFormatter(formatter)
-      LOG._loggers[name].addHandler(console)
-
-    return LOG._loggers[name]
+    __metaclass__ = Singleton
+
+    _loggers = {}
+
+    def __init__(self, *args, **kwargs):
+        pass
+
+    @staticmethod
+    def getLogger(role=None, filename="", testlogger=False, filepath=""):
+        role += filename
+	
+        if role not in LOG._loggers.keys():
+            if testlogger:
+                log_filename = filepath + filename + '_logging_rotatingfile.log'
+            else:
+                log_filename = filename + '_logging_rotatingfile.log'
+
+            logging.basicConfig(level=logging.DEBUG,
+                                format='%(asctime)s %(threadName)-12s %(name)-16s %(levelname)-6s {%(filename)-12s %(lineno)-4d}  %(message)-100s',
+                                datefmt='%m-%d %H:%M',
+                                filename=log_filename,
+                                filemode='w')
+
+            # Add the log message handler to the logger
+            handler = logging.handlers.RotatingFileHandler(
+                log_filename, maxBytes=1073741824, backupCount=2)
+    
+            console = logging.StreamHandler()
+            formatter = logging.Formatter('%(asctime)s %(threadName)-14s %(name)-19s %(message)s')
+            console.setLevel(logging.INFO)
+            console.setFormatter(formatter)
+    
+            formatter = logging.Formatter('%(asctime)s %(levelname)-s : %(message)-100s','%m-%d %H:%M')
+            LOG._loggers[role] = logging.getLogger(str(role))
+            LOG._loggers[role].setLevel(logging.DEBUG)
+    
+            LOG._loggers[role].addHandler(handler)
+            handler.setFormatter(formatter)
+            LOG._loggers[role].addHandler(console)
+
+        return LOG._loggers[role]
+
+
+    @staticmethod
+    def removeLogger(role, filename):
+        role += filename
+        if role in LOG._loggers.keys():
+            del LOG._loggers[role]