Validation of Evaluations

api/ui/evaluation.php

@@ -77,6 +77,14 @@ public function get() {
 
         if (!empty($this->get['action'])) {
             switch ($this->get['action']) {
+                case 'getLogalyzerResponses':
+                    $qF = new QueryFilter(Job::EVALUATION_ID, $evaluation->getId(), "=");
+                    $jobs = Factory::getJobFactory()->filter([$qF]);
+                    //foreach ($jobs as $job) {
+                        //
+                    //}
+                    $array = [];
+                    $this->addData('response', $array);
                 case 'countFinishedJobs':
                     // retrieve how many jobs are finished
                     $qF1 = new QueryFilter(Job::STATUS, Define::JOB_STATUS_FINISHED, "=");

api/ui/job.php

@@ -37,6 +37,13 @@ public function patch() {
         if (isset($this->request['progress'])) {
             $job->setProgress($this->request['progress']);
         }
+        if(isset($this->request['getLogalyzerResponse'])) {
+            $warning = -1;
+            $error = -1;
+            $mandatory = -1;
+            $string = json_encode('{"warning": ' . $warning .',"error": '. $error . ',"mandatory": '. $mandatory .'}');
+            $this->addData('response', $string);
+        }
         Factory::getJobFactory()->update($job);
     }
 }

api/v1/job.php

@@ -109,6 +109,22 @@ public function get() {
             } else {
                 $data->log = $log;
             }
+            // Dynamically fetch Logalyzer results
+            $data->logErrorCount = Factory::getJobFactory()->getJobCountForLogLevel($job, 'error', 'negative');
+            $data->logWarningCount = Factory::getJobFactory()->getJobCountForLogLevel($job, 'warn', 'negative');
+            if($job->getStatus()==Define::JOB_STATUS_FINISHED && !Factory::getJobFactory()->checkAllPositiveJobPatterns($job)) {
+                $data->logContainsMandatory=0;
+            }
+            $logalyzer = new Logalyzer_Library();
+            $logalyzer->setSystemAndLoadPattern($system);
+            $hash = $logalyzer->calculateSystemHash();
+            $json = $job->getLogalyzerResults();
+            if($json != null) {
+                $results = json_decode($json, true);
+                if (!isset($results['hash']) || $results['hash'] != $hash) {
+                    $data->usedOutdatedPattern = true;
+                }
+            }
         }
         $this->add($data);
     }
@@ -163,7 +179,6 @@ public function patch() {
         if (empty($this->get['id'])) {
             throw new Exception('No id provided');
         }
-
         $auth = Auth_Library::getInstance();
         $job = Factory::getJobFactory()->get($this->get['id']);
         $evaluation = Factory::getEvaluationFactory()->get($job->getEvaluationId());
@@ -298,5 +313,7 @@ private function appendLog($id) {
             mkdir(UPLOADED_DATA_PATH . 'log');
         }
         file_put_contents(UPLOADED_DATA_PATH . 'log/' . $id . '.log', $this->request['log'], FILE_APPEND);
+        $logalyzer = new Logalyzer_Library($job);
+        $logalyzer->examineLogLine($this->request['log']);
     }
 }

chronos.sql

@@ -70,7 +70,8 @@ CREATE TABLE `Job` (
   `finished` datetime DEFAULT NULL,
   `evaluationId` int(11) NOT NULL,
   `internalId` int(11) NOT NULL,
-  `configurationIdentifier` varchar(256) COLLATE utf8_unicode_ci NOT NULL
+  `configurationIdentifier` varchar(256) COLLATE utf8_unicode_ci NOT NULL,
+  `logalyzerResults` json
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 
@@ -130,7 +131,8 @@ CREATE TABLE `System` (
   `vcsPassword` varchar(256) COLLATE utf8_unicode_ci NOT NULL,
   `created` datetime NOT NULL,
   `lastEdit` datetime NOT NULL,
-  `isArchived` int(11) NOT NULL
+  `isArchived` int(11) NOT NULL,
+  `logalyzerPatterns` json
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 
@@ -215,6 +217,7 @@ CREATE INDEX job_idx_2 ON `Job`(systemId);
 CREATE INDEX job_idx_3 ON `Job`(status);
 CREATE INDEX job_idx_4 ON `Job`(evaluationId);
 CREATE INDEX job_idx_5 ON `Job`(internalId);
+CREATE INDEX job_idx_6 ON `Job`(logalyzerHash);
 
 CREATE INDEX project_idx_1 ON `Project`(userId);
 CREATE INDEX project_idx_2 ON `Project`(systemId);

constants.php

@@ -1,2 +1,3 @@
 <?php
 define('APP_VERSION', '1.2-dev');
+define('LOG_ERRORS_MAX', 10);

controllers/admin.php

@@ -330,7 +330,6 @@ public function systems() {
      */
     public function system() {
         $this->view->includeAsset("gitgraph");
-
         if (!empty($this->get['id'])) {
             $system = new System($this->get['id']);
             $system = $system->getModel();
@@ -339,7 +338,6 @@ public function system() {
             if ($system->getUserId() != $auth->getUserID() && !$auth->isAdmin()) {
                 throw new Exception("Not enough privileges to view this system!");
             }
-
             if (!empty($this->post['id'])) {
                 if ($this->post['group'] == 'general') {
                     $data = $this->post;
@@ -391,8 +389,70 @@ public function system() {
                             throw new Exception("Key already used!");
                         }
                     }
+                } else if (!empty($this->post['group'] =='newError')) {
+                    $key = $this->post['newErrorPattern'];
+                    if ($key != "") {
+                        $system = Factory::getSystemFactory()->get($this->post['id']);
+                        $logalyzer = new Logalyzer_Library();
+                        $logalyzer->setSystemAndLoadPattern($system);
+                        if(!empty($this->post['regexError'])&&$this->post['regexError']=='on') {
+                            $logalyzer->addKey('error', $key, 'regex', 'negative');
+                        } else {
+                            $logalyzer->addKey('error', $key, 'string', 'negative');
+                        }
+                    }
+                } else if (!empty($this->post['group'] == 'newWarning')) {
+                    $key = $this->post['newWarningPattern'];
+                    if ($key != "") {
+                        $system = Factory::getSystemFactory()->get($this->post['id']);
+                        $logalyzer = new Logalyzer_Library();
+                        $logalyzer->setSystemAndLoadPattern($system);
+                        if(!empty($this->post['regexWarning'])&&$this->post['regexWarning']=='on') {
+                            $logalyzer->addKey('warn', $key, 'regex', 'negative');
+                        } else {
+                            $logalyzer->addKey('warn', $key, 'string', 'negative');
+                        }
+                    }
+                } else if (!empty($this->post['group'] == 'newMandatory')) {
+                    $key = $this->post['newMandatoryPattern'];
+                    if ($key != "") {
+                        $system = Factory::getSystemFactory()->get($this->post['id']);
+                        $logalyzer = new Logalyzer_Library();
+                        $logalyzer->setSystemAndLoadPattern($system);
+                        if(!empty($this->post['regexMandatory'])&&$this->post['regexMandatory']=='on') {
+                            $logalyzer->addKey('error', $key, 'regex', 'positive');
+                        } else {
+                            $logalyzer->addKey('error', $key, 'string', 'positive');
+                        }
+                    }
+                }
+            }
+            else if (!empty($this->get['deleteWarningPattern'])) {
+                $key = $this->get['deleteWarningPattern'];
+                if ($key != "") {
+                    $system = Factory::getSystemFactory()->get($this->get['id']);
+                    $logalyzer = new Logalyzer_Library();
+                    $logalyzer->setSystemAndLoadPattern($system);
+                    $logalyzer->removeKey('warn', $key, 'negative');
                 }
-            } else if (!empty($this->get['delete'])) {
+            } else if (!empty($this->get['deleteErrorPattern'])) {
+                $key = $this->get['deleteErrorPattern'];
+                if ($key != "") {
+                    $system = Factory::getSystemFactory()->get($this->get['id']);
+                    $logalyzer = new Logalyzer_Library();
+                    $logalyzer->setSystemAndLoadPattern($system);
+                    $logalyzer->removeKey('error', $key, 'negative');
+                }
+            } else if (!empty($this->get['deleteMandatoryPattern'])) {
+                $key = $this->get['deleteMandatoryPattern'];
+                if ($key != "") {
+                    $system = Factory::getSystemFactory()->get($this->get['id']);
+                    $logalyzer = new Logalyzer_Library();
+                    $logalyzer->setSystemAndLoadPattern($system);
+                    $logalyzer->removeKey('error', $key, 'positive');
+                }
+            }
+            else if (!empty($this->get['delete'])) {
                 $settings = Settings_Library::getInstance($system->getId());
                 if (!empty($this->get['delete'])) {
                     $key = urldecode($this->get['delete']);
@@ -497,6 +557,15 @@ public function system() {
             $this->view->assign('branches', Systems_Library::getBranches($system->getId()));
             $this->view->assign('history', Systems_Library::getHistory($system->getId()));
             $this->view->assign('auth', Auth_Library::getInstance());
+
+            $logalyzer = new Logalyzer_Library();
+            $logalyzer->setSystemAndLoadPattern($system);
+            $errors = $logalyzer->getPatterns('error', 'negative');
+            $warnings = $logalyzer->getPatterns('warn', 'negative');
+            $mandatory = $logalyzer->getPatterns('error', "positive");
+            $this->view->assign('errorPatterns', $errors);
+            $this->view->assign('warningPatterns', $warnings);
+            $this->view->assign('mandatoryPatterns', $mandatory);
         } else {
             throw new Exception("No id provided!");
         }

controllers/evaluation.php

@@ -130,7 +130,22 @@ public function detail() {
                     $evaluation->setIsStarred(0);
                     Factory::getEvaluationFactory()->update($evaluation);
                 }
-
+                // Button press to reexamine entire log
+                // Button shows up if the job was inspected using an outdated pattern
+                if (!empty($this->post['recheck'])) {
+                    $job = Factory::getJobFactory()->get($this->post['jobId']);
+                    $logalyzer = new Logalyzer_Library($job);
+                    $logalyzer->examineEntireLog();
+                }
+                // Recheck all Jobs contained in an Evaluation
+                if (!empty($this->post['recheckAll'])) {
+                    $qF = new QueryFilter(Job::EVALUATION_ID, $evaluation->getId(), "=");
+                    $jobs = Factory::getJobFactory()->filter([Factory::FILTER => $qF]);
+                    foreach ($jobs as $subJob) {
+                        $logalyzer = new Logalyzer_Library($subJob);
+                        $logalyzer->examineEntireLog();
+                    }
+                }
                 $experiment = Factory::getExperimentFactory()->get($evaluation->getExperimentId());
 
                 // Check if the user has enough privileges to access this evaluation
@@ -151,6 +166,14 @@ public function detail() {
                 $this->view->assign('subjobs', $jobs);
                 $sys = new System($evaluation->getSystemId());
                 $this->view->assign('supportsShowResults', $sys->supportsFullResults());
+                $system = Factory::getSystemFactory()->get($experiment->getSystemId());
+
+                $logalyzer = new Logalyzer_Library();
+                $logalyzer->setSystemAndLoadPattern($system);
+                $systemHash = $logalyzer->calculateSystemHash();
+                $this->view->assign('systemHash', $systemHash);
+                $usedOutdatedPattern = false;
+
                 // check if all jobs have finished
                 $isFinished = true;
                 $resultsAvailable = false;
@@ -160,10 +183,16 @@ public function detail() {
                     } else {
                         $resultsAvailable = true;
                     }
+                    if(Factory::getJobFactory()->getJobHash($subJob) != $systemHash && Factory::getJobFactory()->getJobHash($subJob) != "") {
+                        $usedOutdatedPattern = true;
+                    }
                 }
                 if (sizeof($jobs) == 0) {
                     $isFinished = false;
                 }
+                if ($usedOutdatedPattern) {
+                    $this->view->assign('usedOutdatedPattern', true);
+                }
                 $this->view->assign('isFinished', $isFinished);
                 $this->view->assign('resultsAvailable', $resultsAvailable);
             } else {

controllers/job.php

@@ -143,12 +143,39 @@ public function detail() {
                 $this->view->assign('evaluation', $evaluation);
                 $this->view->assign('experiment', Factory::getExperimentFactory()->get($evaluation->getExperimentId()));
 
+                if (!empty($this->post['recheck'])) {
+                    $logalyzer = new Logalyzer_Library($job);
+                    $logalyzer->examineEntireLog();
+                }
+
+                $this->view->assign('logWarningCount', Factory::getJobFactory()->getJobCountForLogLevel($job, 'warn', 'negative'));
+                $this->view->assign('logErrorCount', Factory::getJobFactory()->getJobCountForLogLevel($job, 'error', 'negative'));
+                if($job->getStatus()==Define::JOB_STATUS_FINISHED && !Factory::getJobFactory()->checkAllPositiveJobPatterns($job)) {
+                    $this->view->assign('logContainsMandatory', 0);
+                }
+                $system = Factory::getSystemFactory()->get($job->getSystemId());
+
+                // Fetch a Job's Logalyzer results to check if it is up-to-date.
+                $logalyzer = new Logalyzer_Library();
+                $logalyzer->setSystemAndLoadPattern($system);
+                $hash = $logalyzer->calculateSystemHash();
+                $json = $job->getLogalyzerResults();
+                if($json != null) {
+                    $results = json_decode($json, true);
+                    if(!isset($results['hash'])||$results['hash'] != $hash) {
+                        $this->view->assign('usedOutdatedPattern', true);
+                    }
+                }
+
+
                 $events = Util::eventFilter(['job' => $job]);
                 $this->view->assign('events', $events);
             } else {
                 throw new Exception("No job with id: " . $this->get['id']);
             }
-        } else {
+
+        }
+        else {
             throw new Exception("No job id provided!");
         }
     }