Merge pull request #2 from Ukrator/implement-multiline-push

Implement multiline sentry push
move-elevator · Sep 29, 2016 · 45c4837 · 45c4837
2 parents 1c78638 + 31d37d1
commit 45c4837
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 5 deletions.
diff --git a/src/Command/PushCommand.php b/src/Command/PushCommand.php
@@ -54,9 +54,15 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $progress = new ProgressBar($output, $logFileParser->count());
         $progress->start();
 
-        foreach ($logFileParser->getEntries() as $entry) {
-            $sentryPusher->push($entry, $typeToLevel);
-            $progress->advance();
+        if (Parser::TYPE_FORMLESS === $input->getOption('logfile-type')) {
+            $sentryPusher->pushMultiline($logFileParser->getEntries(), $typeToLevel);
+        }
+
+        if (Parser::TYPE_FORMLESS !== $input->getOption('logfile-type')) {
+            foreach ($logFileParser->getEntries() as $entry) {
+                $sentryPusher->push($entry, $typeToLevel);
+                $progress->advance();
+            }
         }
 
         $progress->finish();

diff --git a/src/Service/SentryPusher.php b/src/Service/SentryPusher.php
@@ -28,7 +28,6 @@ public function __construct(\Raven_Client $client)
      * @param TypeToLevelInterface $typeToLevel
      *
      * @return int
-     * @throws SentryException
      */
     public function push($entry, TypeToLevelInterface $typeToLevel)
     {
@@ -38,7 +37,49 @@ public function push($entry, TypeToLevelInterface $typeToLevel)
             'level' => $typeToLevel->getLevel($entry->type)
         ];
 
-        $eventId = $this->client->getIdent($this->client->captureMessage($entry->message, [], $options));
+        $eventId = $this->pushToSentry($entry->message, $options);
+
+        return $eventId;
+    }
+
+    /**
+     * @param array                $entries
+     * @param TypeToLevelInterface $typeToLevel
+     *
+     * @return mixed
+     */
+    public function pushMultiline(array $entries, TypeToLevelInterface $typeToLevel)
+    {
+        $sentryLog = '';
+        foreach ($entries as $logEntry) {
+            $sentryLog .= $logEntry->message;
+        }
+
+        $options = [
+            'tags' => ['Source' => 'Log'],
+            'level' => $typeToLevel->getLevel('info'),
+            'extra' => ['log' => $sentryLog]
+        ];
+
+        $now = new \DateTime();
+        $message = sprintf('Formless Log %s', $now->format('d-m-Y'));
+
+        $eventId = $this->pushToSentry($message, $options);
+
+        return $eventId;
+    }
+
+    /**
+     * @param string $sentryLog
+     * @param array  $options
+     *
+     * @throws SentryException
+     *
+     * @return int
+     */
+    private function pushToSentry($sentryLog, array $options)
+    {
+        $eventId = $this->client->getIdent($this->client->captureMessage($sentryLog, [], $options));
         $lastError = $this->client->getLastError();
 
         if (null !== $lastError) {