fixes for refresh

internet2 · Jan 8, 2021 · 6eecde4 · 6eecde4
1 parent e5b7060
commit 6eecde4
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/Workbench/docker-compose.yml b/Workbench/docker-compose.yml
@@ -361,6 +361,7 @@ services:
      - net
     ports:
      - 15672:15672
+     - 5672:5672
     healthcheck:
       test: curl -s 127.0.0.1:15672 > /dev/null
       interval: 30s

diff --git a/Workbench/scripts/refreshListener.php b/Workbench/scripts/refreshListener.php
@@ -1,8 +1,8 @@
 <?php
-require_once '/vendor/autoload.php';
+require_once '/home/csprootuser/vendor/autoload.php';
 use PhpAmqpLib\Connection\AMQPStreamConnection;
 
-$connection = new AMQPStreamConnection('mq', 5672, 'guest', 'password');
+$connection = new AMQPStreamConnection('localhost', 5672, 'guest', 'password');
 $channel = $connection->channel();
 
 $channel->queue_declare('refreshInstance', false, false, false, false);
@@ -15,6 +15,10 @@
         echo "Received REFRESH message!\n";
 		shell_exec( "/csp-tap/InCommonTAP-Examples/Workbench/scripts/refresh-this-instance.sh" );
 	}
+    if ($msg->body == "REFRESH_THIS_INSTANCE_DELETE_DATA") {
+        echo "Received REFRESH-DELETE message!\n";
+		shell_exec( "/csp-tap/InCommonTAP-Examples/Workbench/scripts/refresh-this-instance.sh -dv" );
+	}
 };
 
 $channel->basic_consume('refreshInstance', '', false, true, false, false, $callback);

diff --git a/Workbench/webproxy/container_files/httpd/index.html b/Workbench/webproxy/container_files/httpd/index.html
@@ -40,6 +40,7 @@ <h3>Welcome to the InCommon TAP Workbench!</h3>
 </ul>
 <br /><br /><br />
 <a href="https://__CSPHOSTNAME__/status" target="TAP-WB-STATUS">Container Status</a>
+<br />
 <a href="https://__CSPHOSTNAME__/refresh/" target="TAP-WB-REFRESH">Refresh this instance</a>
 
 
diff --git a/Workbench/webproxy/container_files/httpd/refresh/index.php b/Workbench/webproxy/container_files/httpd/refresh/index.php
@@ -23,7 +23,10 @@
 <br /><br />
 
 <form method = "POST" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>">
-Confirmation: <input type="text" name="confirm" id="confirm" value="<?php echo $confirm;?>">
+Confirmation: <input type="text" name="confirm" id="confirm" value="<?php echo $confirm;?>"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<input type="checkbox" name="delvol" id="delvol" value="delvol">
+<label for="delvol">Delete data volumes during refresh?</label>
+
 <br /><br />
 <button type = "submit" id = "btn-submit">Confirm</button>
 </form>
@@ -40,7 +43,11 @@
 
     $channel->queue_declare('refreshInstance', false, false, false, false);
 
-    $msg = new AMQPMessage('REFRESH_THIS_INSTANCE');
+    if (isset($_POST["delvol"])) {
+     $msg = new AMQPMessage('REFRESH_THIS_INSTANCE_DELETE_DATA');
+	} else {
+	 $msg = new AMQPMessage('REFRESH_THIS_INSTANCE');	
+	}
     $channel->basic_publish($msg, '', 'refreshInstance');
 
     $channel->close();