Merge pull request #48 from Shadercloud/master

Add tunneler:reset Command

src/Console/TunnelerReset.php

@@ -0,0 +1,45 @@
+<?php
+namespace STS\Tunneler\Console;
+
+use Illuminate\Console\Command;
+use STS\Tunneler\Jobs\CreateTunnel;
+
+class TunnelerReset extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'tunneler:reset';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Destroy and reconnect the SSH tunnel';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        $tunnel = new CreateTunnel();
+        $tunnel->destoryTunnel();
+
+        \Artisan::call('tunneler:activate');
+    }
+}

src/Jobs/CreateTunnel.php

@@ -58,13 +58,13 @@ public function handle(): int
         }
 
         $this->createTunnel();
-        
+
         $tries = config('tunneler.tries');
         for ($i = 0; $i < $tries; $i++) {
             if ($this->verifyTunnel()) {
                 return 2;
             }
-            
+
             // Wait a bit until next iteration
             usleep(config('tunneler.wait'));
         }
@@ -101,6 +101,15 @@ protected function verifyTunnel()
         return $this->runCommand($this->ncCommand);
     }
 
+    /*
+     * Use pkill to kill the SSH tunnel
+     */
+
+    public function destoryTunnel(){
+        $ssh_command = preg_replace('/[\s]{2}[\s]*/',' ',$this->sshCommand);
+        return $this->runCommand('pkill -f "'.$ssh_command.'"');
+    }
+
     /**
      * Runs a command and converts the exit code to a boolean
      * @param $command

src/TunnelerServiceProvider.php

@@ -2,6 +2,7 @@
 
 use Illuminate\Support\ServiceProvider;
 use STS\Tunneler\Console\TunnelerCommand;
+use STS\Tunneler\Console\TunnelerReset;
 use STS\Tunneler\Jobs\CreateTunnel;
 
 
@@ -50,6 +51,14 @@ function ($app) {
         );
 
         $this->commands('command.tunneler.activate');
+
+        $this->app->singleton('command.tunneler.reset',
+            function ($app) {
+                return new TunnelerReset();
+            }
+        );
+
+        $this->commands('command.tunneler.reset');
     }
 
     /**