Merge pull request #1593 from tulibraries/qa

Set up hotfix 0.12.2
tulibraries · Nov 15, 2019 · d34a5fa · d34a5fa
2 parents 2286fe6 + 836f9c8
commit d34a5fa
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/.env.prod b/.env.prod
@@ -1,5 +1,5 @@
-#SOLR_HOST_IP=172.104.13.101 # cob-prod-solr-1
-SOLR_HOST_IP=172.104.31.60 # cob-prod-solr-2
+SOLR_HOST_IP=172.104.13.101 # cob-prod-solr-1
+#SOLR_HOST_IP=172.104.31.60 # cob-prod-solr-2
 export SOLR_URL="http://$SOLR_HOST_IP:8983/solr/blacklight-core"
 export SOLR_AZ_URL="http://$SOLR_HOST_IP:8983/solr/az-database"
 export SOLR_WEB_CONTENT_URL="http://$SOLR_HOST_IP:8983/solr/web-content"
diff --git a/.env.stage b/.env.stage
@@ -1,5 +1,5 @@
-SOLR_HOST_IP=172.104.13.101 # cob-prod-solr-1
-#SOLR_HOST_IP=172.104.31.60 # cob-prod-solr-2
+#SOLR_HOST_IP=172.104.13.101 # cob-prod-solr-1
+SOLR_HOST_IP=172.104.31.60 # cob-prod-solr-2
 export SOLR_URL="http://$SOLR_HOST_IP:8983/solr/blacklight-core"
 export SOLR_AZ_URL="http://$SOLR_HOST_IP:8983/solr/az-database"
 export SOLR_WEB_CONTENT_URL="http://$SOLR_HOST_IP:8983/solr/web-content"
diff --git a/app/controllers/almaws_controller.rb b/app/controllers/almaws_controller.rb
@@ -121,12 +121,12 @@ def send_asrs_request
     }
 
     @asrs_request_level = params[:asrs_request_level]
-    #log = { type: "submit_asrs_request", user: current_user.id }.merge(options)
+    log = { type: "submit_asrs_request", user: current_user.id }.merge(options)
 
     begin
       requests_made = 0
       if @asrs_request_level == "bib"
-        Alma::BibRequest.submit(options)
+        do_with_json_logger(log) { Alma::BibRequest.submit(options) }
         requests_made += 1
       else
         # TODO: Will update this depending on Justin's decision regarding
@@ -138,10 +138,11 @@ def send_asrs_request
           holding_id = item["holding_id"]
           item_pid = item["item_pid"]
 
-          Alma::ItemRequest.submit(
-            options.merge(
-              holding_id: holding_id,
-              item_pid: item_pid))
+          item_options = { holding_id: holding_id, item_pid: item_pid }
+
+          do_with_json_logger(log.merge(item_options)) {
+            Alma::ItemRequest.submit(options.merge(item_options))
+          }
 
           requests_made += 1
           break