Skip to content

Commit

Permalink
Merge pull request #32 from vesper8/master
Browse files Browse the repository at this point in the history
multiple fixes, probably warrants a 2.0 release
  • Loading branch information
bubba-h57 committed Oct 14, 2019
2 parents 31ddd09 + b42d985 commit e7563e1
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 15 deletions.
12 changes: 1 addition & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,6 @@ We do not support version <=5.1.
composer require stechstudio/laravel-ssh-tunnel
```

### Register the Provider (Laravel version 5.8):

Inside the `config/app.php` file under `Package Service Providers`, add:

```STS\Tunneler\TunnelerServiceProvider::class,```

And under `Application Service Providers`, add:

```STS\Tunneler\TunnelerServiceProvider::class,```

### Register the Provider (version 5.4 and earlier):

For Lumen services, add:
Expand Down Expand Up @@ -85,7 +75,7 @@ TUNNELER_PORT=sshport

; How long to wait, in microseconds, before testing to see if the tunnel is created.
; Depending on your network speeds you will want to modify the default of .5 seconds
TUNNELER_CONN_WAIT=500000
TUNNELER_CONN_WAIT=1000000

; How often it is checked if the tunnel is created. Useful if the tunnel creation is sometimes slow,
; and you want to minimize waiting times
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
],
"minimum-stability": "stable",
"require": {
"illuminate/support": "^5.0|^6.0"
"illuminate/support": "^5.5|^6.0"
},
"extra": {
"laravel": {
Expand Down
2 changes: 1 addition & 1 deletion config/tunneler.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
'user' => env('TUNNELER_USER'),
'hostname' => env('TUNNELER_HOSTNAME'),
'port' => env('TUNNELER_PORT'),
'wait' => env('TUNNELER_CONN_WAIT', '500000'),
'wait' => env('TUNNELER_CONN_WAIT', '1000000'),
'tries' => env('TUNNELER_CONN_TRIES', 1),

'on_boot' => filter_var(env('TUNNELER_ON_BOOT', false), FILTER_VALIDATE_BOOLEAN),
Expand Down
2 changes: 1 addition & 1 deletion src/Console/TunnelerCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class TunnelerCommand extends Command {

public function handle(){
try {
$result = dispatch(new CreateTunnel());
$result = dispatch_now(new CreateTunnel());
}catch (\ErrorException $e){
$this->error($e->getMessage());
return 1;
Expand Down
2 changes: 1 addition & 1 deletion src/Jobs/CreateTunnel.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class CreateTunnel
public function __construct()
{

$this->ncCommand = sprintf('%s -z %s %d > /dev/null 2>&1',
$this->ncCommand = sprintf('%s -vz %s %d > /dev/null 2>&1',
config('tunneler.nc_path'),
config('tunneler.local_address'),
config('tunneler.local_port')
Expand Down

0 comments on commit e7563e1

Please sign in to comment.