Skip to content

DEVOPS-139: Enable Configurable Timeouts #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

DEVOPS-139: Enable Configurable Timeouts #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/ServiceProviderLaravel4.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@ public function register()
'allow_markdown' => is_bool($allow_markdown) ? $allow_markdown : true,
'markdown_in_attachments' => is_array($markdown_in_attachments) ? $markdown_in_attachments : [],
],
new Guzzle
new Guzzle([
'connect_timeout' => $app['config']->get('slack.connection_timeout'),
'timeout' => $app['config']->get('slack.request_timeout'),
])
);
});

Expand Down
5 changes: 4 additions & 1 deletion src/ServiceProviderLaravel5.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,10 @@ public function register()
'allow_markdown' => $app['config']->get('slack.allow_markdown'),
'markdown_in_attachments' => $app['config']->get('slack.markdown_in_attachments'),
],
new Guzzle
new Guzzle([
'connect_timeout' => $app['config']->get('slack.connection_timeout'),
'timeout' => $app['config']->get('slack.request_timeout'),
])
);
});

Expand Down
24 changes: 24 additions & 0 deletions src/config/config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,30 @@

'endpoint' => '',

/*
|-------------------------------------------------------------
| Webhook connection timeout
|-------------------------------------------------------------
|
| The maximum number of seconds to wait for a connection to
| the webhook endpoint to be established
|
*/

'connection_timeout' => 5,

/*
|-------------------------------------------------------------
| Webhook request timeout
|-------------------------------------------------------------
|
| The maximum number of seconds to wait for a response from
| the webhook endpoint
|
*/

'request_timeout' => 10,

/*
|-------------------------------------------------------------
| Default channel
Expand Down