Skip to content

swh-indexer-journal-client: Adapt systemd and configuration according to latest version

Antoine R. Dumont requested to merge generated-differential-D1683-source into generated-differential-D1683-target
  • Update cli to latest version
  • Fix configuration change (enclosing journal setup within a 'journal' key)

Fixes migrated/migration$455's description

Test Plan

bin/octocatalog-diff --octocatalog-diff-args --no-truncate-details --to update_configuration getty
Found host getty.internal.softwareheritage.org
Cloning into '/tmp/swh-ocd.si6gfHUC/environments/production/data/private'...
done.
Cloning into '/tmp/swh-ocd.si6gfHUC/environments/update_configuration/data/private'...
done.
*** Running octocatalog-diff on host getty.internal.softwareheritage.org
I, [2019-07-03T16:32:42.452059 #14339]  INFO -- : Catalogs compiled for getty.internal.softwareheritage.org
I, [2019-07-03T16:32:43.158782 #14339]  INFO -- : Diffs computed for getty.internal.softwareheritage.org
diff origin/production/getty.internal.softwareheritage.org current/getty.internal.softwareheritage.org
*******************************************
  File[/etc/softwareheritage/indexer/journal_client.yml] =>
   parameters =>
     content =>
      @@ -1,8 +1,9 @@
       ---
      -brokers:
      -- esnode1.internal.softwareheritage.org
      -- esnode2.internal.softwareheritage.org
      -- esnode3.internal.softwareheritage.org
      -consumer_id: swh.indexer.journal_client
      +journal:
      +  brokers:
      +  - esnode1.internal.softwareheritage.org
      +  - esnode2.internal.softwareheritage.org
      +  - esnode3.internal.softwareheritage.org
      +  group_id: swh.indexer.journal_client
       scheduler:
         cls: remote
*******************************************
  File[/etc/systemd/system/swh-indexer-journal-client.service] =>
   parameters =>
     content =>
      @@ -11,5 +11,5 @@
       Group=swhstorage
       Type=simple
      -ExecStart=/usr/bin/python3 -m swh.indexer.journal_client
      +ExecStart=/usr/bin/swh indexer --config-file /etc/softwareheritage/indexer/journal_client.yml journal-client
       Restart=always
       RestartSec=10
*******************************************
  Systemd::Unit_file[swh-indexer-journal-client.service] =>
   parameters =>
     content =>
      @@ -11,5 +11,5 @@
       Group=swhstorage
       Type=simple
      -ExecStart=/usr/bin/python3 -m swh.indexer.journal_client
      +ExecStart=/usr/bin/swh indexer --config-file /etc/softwareheritage/indexer/journal_client.yml journal-client
       Restart=always
       RestartSec=10
*******************************************
*** End octocatalog-diff on getty.internal.softwareheritage.org

Migrated from D1683 (view on Phabricator)

Merge request reports