workspace-replication-status-check-and-log-6.patch

diff --git a/src/Plugin/QueueWorker/WorkspaceReplication.php b/src/Plugin/QueueWorker/WorkspaceReplication.php
index 92e5147..d119baf 100644
--- a/src/Plugin/QueueWorker/WorkspaceReplication.php
+++ b/src/Plugin/QueueWorker/WorkspaceReplication.php
@@ -3,13 +3,17 @@
 namespace Drupal\workspace\Plugin\QueueWorker;
 
 use Drupal\Component\Datetime\Time;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Logger\LoggerChannelFactoryInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Queue\QueueWorkerBase;
 use Drupal\Core\Queue\RequeueException;
 use Drupal\Core\Session\AccountSwitcherInterface;
 use Drupal\Core\State\StateInterface;
+use Drupal\Core\Utility\Error;
 use Drupal\replication\Entity\ReplicationLogInterface;
 use Drupal\user\Entity\User;
+use Drupal\workspace\Entity\Replication;
 use Drupal\workspace\ReplicatorManager;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -25,25 +29,47 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 class WorkspaceReplication extends QueueWorkerBase implements ContainerFactoryPluginInterface {
 
   /**
+   * The replicator manager.
+   *
    * @var \Drupal\workspace\ReplicatorManager
    */
   protected $replicatorManager;
 
   /**
+   * Time service.
+   *
    * @var \Drupal\Component\Datetime\Time
    */
   protected $time;
 
   /**
+   * The service for safe account switching.
+   *
    * @var \Drupal\Core\Session\AccountSwitcherInterface
    */
   protected $accountSwitcher;
 
   /**
+   * State system service.
+   *
    * @var \Drupal\Core\State\StateInterface
    */
   private $state;
 
+  /**
+   * The logger.
+   *
+   * @var \Drupal\Core\Logger\LoggerChannelInterface
+   */
+  protected $logger;
+
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
   /**
    * {@inheritdoc}
    */
@@ -55,51 +81,83 @@ class WorkspaceReplication extends QueueWorkerBase implements ContainerFactoryPl
       $container->get('workspace.replicator_manager'),
       $container->get('datetime.time'),
       $container->get('account_switcher'),
-      $container->get('state')
+      $container->get('state'),
+      $container->get('logger.factory'),
+      $container->get('entity_type.manager')
     );
   }
 
   /**
    * {@inheritdoc}
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, ReplicatorManager $replicator_manager, Time $time, AccountSwitcherInterface $account_switcher, StateInterface $state) {
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, ReplicatorManager $replicator_manager, Time $time, AccountSwitcherInterface $account_switcher, StateInterface $state, LoggerChannelFactoryInterface $logger, EntityTypeManagerInterface $entity_type_manager) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
     $this->replicatorManager = $replicator_manager;
     $this->time = $time;
     $this->accountSwitcher = $account_switcher;
     $this->state = $state;
+    $this->logger = $logger->get('workspace');
+    $this->entityTypeManager = $entity_type_manager;
   }
 
   /**
-   * @param mixed $data
+   * {@inheritdoc}
    *
    * @throws \Drupal\Core\Entity\EntityStorageException
    */
   public function processItem($data) {
     if ($this->state->get('workspace.last_replication_failed', FALSE)) {
       // Requeue if replication blocked.
-      throw new RequeueException('Replication blocked now!');
+      throw new RequeueException('Replication is blocked!');
     }
-    $account = User::load(1);
-    $this->accountSwitcher->switchTo($account);
-    /**
-     * @var \Drupal\workspace\Entity\Replication $replication
-     */
+
+    /** @var \Drupal\workspace\Entity\Replication $replication */
     $replication = $data['replication'];
-    $replication->setReplicationStatusReplicating();
-    $replication->save();
-    $response = $this->replicatorManager->doReplication($data['source'], $data['target'], $data['task']);
-    if (($response instanceof ReplicationLogInterface) && ($response->get('ok')->value == TRUE)) {
-      $replication->setReplicationStatusReplicated();
-      $replication->set('replicated', $this->time->getRequestTime());
+
+    if ($replication_new = $this->entityTypeManager->getStorage('replication')->load($replication->id())) {
+      $replication = $replication_new;
+    }
+
+    $this->logger->info('Replication status is "@replication_status".', ['@replication_status' => $replication->get('replication_status')->value]);
+    if ($replication->get('replication_status')->value == Replication::QUEUED) {
+      $account = User::load(1);
+      $this->accountSwitcher->switchTo($account);
+
+      $replication->setReplicationStatusReplicating();
       $replication->save();
+      $this->logger->info('Replication "@replication" has started.', ['@replication' => $replication->label()]);
+
+      try {
+        $response = $this->replicatorManager->doReplication($data['source'], $data['target'], $data['task']);
+      }
+      catch (\Exception $e) {
+        // When exception is thrown during replication process we want
+        // replication to be marked as failed and removed from queue.
+        $this->logger->error('%type: @message in %function (line %line of %file).', $variables = Error::decodeException($e));
+        $response = FALSE;
+      }
+
+
+      if (($response instanceof ReplicationLogInterface) && ($response->get('ok')->value == TRUE)) {
+        $replication->setReplicationStatusReplicated();
+        $replication->set('replicated', $this->time->getRequestTime());
+        $replication->save();
+        $this->logger->info('Replication "@replication" has finished successfully.', ['@replication' => $replication->label()]);
+      }
+      else {
+        $replication->setReplicationStatusFailed();
+        $replication->save();
+        $this->state->set('workspace.last_replication_failed', TRUE);
+        $this->logger->info('Replication "@replication" has failed.', ['@replication' => $replication->label()]);
+      }
+
+      $this->accountSwitcher->switchBack();
     }
     else {
-      $replication->setReplicationStatusFailed();
-      $replication->save();
-      $this->state->set('workspace.last_replication_failed', TRUE);
+      // Requeue if replication is in progress.
+      $this->logger->info('Replication "@replication" is already in progress.', ['@replication' => $replication->label()]);
+      throw new RequeueException('Replication is already in progress!');
     }
-    $this->accountSwitcher->switchBack();
   }
 
 }