Skip to content

Commit

Permalink
change default service stop timeout to 10s
Browse files Browse the repository at this point in the history
  • Loading branch information
fraenki committed Oct 10, 2022
1 parent 1cc866c commit 27e4608
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 0 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [Unreleased]

### Added
* add new parameter `$service_timeout`

### Changed
* change default service stop timeout to 10s

## [v2.1.1] - 2022-08-30

### Fixed
Expand Down
1 change: 1 addition & 0 deletions data/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ thumbor::python_config:
venv: 'present'
version: 'python3'
thumbor::security_key: ~
thumbor::service_timeout: 10
thumbor::statefile: 'thumbor.version'
thumbor::update_enabled: true
thumbor::user: 'thumbor'
Expand Down
4 changes: 4 additions & 0 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@
# @param security_key
# Security key to use in thumbor, default undef
#
# @param service_timeout
# Configures the wait time for service commands.

# @param statefile
# This file contains the version information, it is internally used to determine if a venv upgrade is necessary
#
Expand Down Expand Up @@ -94,6 +97,7 @@
Variant[Array[String],String] $ports,
Hash $python_config,
Optional[String] $security_key,
Integer $service_timeout,
String $statefile,
Boolean $update_enabled,
String $user,
Expand Down
1 change: 1 addition & 0 deletions templates/thumbor.systemd.erb
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ WorkingDirectory=<%= scope.lookupvar('thumbor::cfg_path') %>
ExecStart=<%= scope.lookupvar('thumbor::bin_path') -%>/bin/thumbor -c "<%= scope.lookupvar('thumbor::cfg_path') -%>/thumbor.conf" -k "<%= scope.lookupvar('thumbor::cfg_path') -%>/thumbor.key" -i "<%= scope.lookupvar('thumbor::listen') -%>" -p "%i"
User=<%= scope.lookupvar('thumbor::user') %>
Group=<%= scope.lookupvar('thumbor::group') %>
TimeoutStopSec=<%= scope.lookupvar('thumbor::service_timeout') %>

[Install]
WantedBy=multi-user.target

0 comments on commit 27e4608

Please sign in to comment.