Skip to content

storage: Use new wsgi entrypoint

Antoine R. Dumont requested to merge generated-differential-D1169-source into generated-differential-D1169-target

With this new entrypoint and the latest storage, this will use the explicit configuration directly (loaded from SWH_CONFIG_FILENAME)

Related T1533 Related D1167 Related D1168

Test Plan

$ bin/octocatalog-diff --octocatalog-diff-args --no-truncate-details --to update_worker_configuration uffizi
Found host uffizi.softwareheritage.org
Cloning into '/tmp/swh-ocd.cxhd7OuM/environments/production/data/private'...
done.
Cloning into '/tmp/swh-ocd.cxhd7OuM/environments/update_worker_configuration/data/private'...
done.
*** Running octocatalog-diff on host uffizi.softwareheritage.org
I, [2019-02-21T12:30:42.051149 #600]  INFO -- : Catalogs compiled for uffizi.softwareheritage.org
I, [2019-02-21T12:30:43.007234 #600]  INFO -- : Diffs computed for uffizi.softwareheritage.org
diff origin/production/uffizi.softwareheritage.org current/uffizi.softwareheritage.org
*******************************************
  File[/etc/systemd/system/gunicorn-swh-storage.service] =>
   parameters =>
     content =>
      @@ -15,5 +15,5 @@
       WorkingDirectory=/run/gunicorn/swh-storage
       Environment=SWH_CONFIG_FILENAME=/etc/softwareheritage/storage/storage.yml
      -ExecStart=/usr/bin/gunicorn3 -p /run/gunicorn/swh-storage/pidfile -c /etc/gunicorn/instances/swh-storage.cfg swh.storage.api.server:run_from_webserver
      +ExecStart=/usr/bin/gunicorn3 -p /run/gunicorn/swh-storage/pidfile -c /etc/gunicorn/instances/swh-storage.cfg swh.storage.api.wsgi
       ExecStop=/bin/kill -TERM $MAINPID
       ExecReload=/bin/kill -HUP $MAINPID
*******************************************
  Gunicorn::Instance[swh-storage] =>
   parameters =>
     executable =>
      - swh.storage.api.server:run_from_webserver
      + swh.storage.api.wsgi
*******************************************
  Profile::Swh::Deploy::Rpc_server[storage] =>
   parameters =>
     executable =>
      - swh.storage.api.server:run_from_webserver
      + swh.storage.api.wsgi
*******************************************
  Systemd::Unit_file[gunicorn-swh-storage.service] =>
   parameters =>
     content =>
      @@ -15,5 +15,5 @@
       WorkingDirectory=/run/gunicorn/swh-storage
       Environment=SWH_CONFIG_FILENAME=/etc/softwareheritage/storage/storage.yml
      -ExecStart=/usr/bin/gunicorn3 -p /run/gunicorn/swh-storage/pidfile -c /etc/gunicorn/instances/swh-storage.cfg swh.storage.api.server:run_from_webserver
      +ExecStart=/usr/bin/gunicorn3 -p /run/gunicorn/swh-storage/pidfile -c /etc/gunicorn/instances/swh-storage.cfg swh.storage.api.wsgi
       ExecStop=/bin/kill -TERM $MAINPID
       ExecReload=/bin/kill -HUP $MAINPID
*******************************************
*** End octocatalog-diff on uffizi.softwareheritage.org

Migrated from D1169 (view on Phabricator)

Merge request reports