Set graceful shutdown off by default #1927
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Still allow haraka -c <path> --graceful Also sets graceful shutdown to shutdown in max 2xChildren amount of time it sets to shutdown.
|
Hrmm, the nodemailer integration test is failing with this change. Not sure why. |
Makes the tests pass
Codecov Report
@@ Coverage Diff @@
## master #1927 +/- ##
=========================================
- Coverage 58.17% 58.1% -0.08%
=========================================
Files 30 30
Lines 5882 5891 +9
Branches 1474 1475 +1
=========================================
+ Hits 3422 3423 +1
- Misses 2460 2468 +8
Continue to review full report at Codecov.
|
|
Fixed that issue and made it a bit more sane.
…On Sun, May 21, 2017 at 3:15 PM, Codecov ***@***.***> wrote:
Codecov <https://codecov.io/gh/haraka/Haraka/pull/1927?src=pr&el=h1>
Report
Merging #1927
<https://codecov.io/gh/haraka/Haraka/pull/1927?src=pr&el=desc> into master
<https://codecov.io/gh/haraka/Haraka/commit/f42e75849bcb99b8dce9893baa17541e9db07bc7?src=pr&el=desc>
will *decrease* coverage by 0.05%.
The diff coverage is 43.75%.
[image: Impacted file tree graph]
<https://codecov.io/gh/haraka/Haraka/pull/1927?src=pr&el=tree>
@@ Coverage Diff @@## master #1927 +/- ##
==========================================- Coverage 58.17% 58.12% -0.06%
==========================================
Files 30 30
Lines 5882 5891 +9
Branches 1474 1475 +1
==========================================+ Hits 3422 3424 +2 - Misses 2460 2467 +7
Impacted Files
<https://codecov.io/gh/haraka/Haraka/pull/1927?src=pr&el=tree> Coverage Δ
configfile.js
<https://codecov.io/gh/haraka/Haraka/pull/1927?src=pr&el=tree#diff-Y29uZmlnZmlsZS5qcw==> 70.67%
<0%> (-0.21%) ⬇️
server.js
<https://codecov.io/gh/haraka/Haraka/pull/1927?src=pr&el=tree#diff-c2VydmVyLmpz> 36.66%
<46.15%> (-0.63%) ⬇️
tls_socket.js
<https://codecov.io/gh/haraka/Haraka/pull/1927?src=pr&el=tree#diff-dGxzX3NvY2tldC5qcw==> 73.19%
<50%> (-0.25%) ⬇️
timer_queue.js
<https://codecov.io/gh/haraka/Haraka/pull/1927?src=pr&el=tree#diff-dGltZXJfcXVldWUuanM=> 41.02%
<0%> (+2.56%) ⬆️
------------------------------
Continue to review full report at Codecov
<https://codecov.io/gh/haraka/Haraka/pull/1927?src=pr&el=continue>.
*Legend* - Click here to learn more
<https://docs.codecov.io/docs/codecov-delta>
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov
<https://codecov.io/gh/haraka/Haraka/pull/1927?src=pr&el=footer>. Last
update f42e758...1c570a0
<https://codecov.io/gh/haraka/Haraka/pull/1927?src=pr&el=lastupdated>.
Read the comment docs <https://docs.codecov.io/docs/pull-request-comments>
.
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#1927 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/AAobY_zhe0mCpvKqhv15iZNmgLlmJNg_ks5r8I1SgaJpZM4Nhcmb>
.
|
baudehlo
commented
May 21, 2017
| @@ -266,6 +266,7 @@ cfreader.ensure_enoent_timer = function () { | |||
| })(files[i]); // END BLOCK SCOPE | |||
| } | |||
| }, 60 * 1000); | |||
| cfreader._enoent_timer.unref(); | |||
There was a problem hiding this comment.
BTW how come we now have a haraka-config package and this file is still in Haraka?
There was a problem hiding this comment.
Since moving config into a module (so npm plugins could depend on it) I've been moving more and more stuff to depend on haraka-config, with the eventual plan to deprecate the build-in conifg.js and configfile.js. We're a ways down that road and I don't recall right now what's left to do.
| @@ -1,6 +1,7 @@ | |||
| 'use strict'; | |||
| // smtp network server | |||
|
|
|||
| // var log = require('why-is-node-running'); | |||
There was a problem hiding this comment.
BTW I left this in but commented because it makes it easy to debug any kind of "won't quit" issues in the future.
There was a problem hiding this comment.
Says the guy that use to be adamantly opposed to such a thing. ;-) Welcome to the dark side. ;-)
| @@ -137,6 +137,10 @@ pluggableStream.prototype.setKeepAlive = function (bool) { | |||
| pluggableStream.prototype.setNoDelay = function (/* true||false */) { | |||
| }; | |||
|
|
|||
| pluggableStream.prototype.unref = function () { | |||
| return this.targetsocket.unref(); | |||
| }; | |||
There was a problem hiding this comment.
I added this in case we need to unref a socket in the future.
There was a problem hiding this comment.
Could this ever get called while targetsocket is undefined?
msimerson
approved these changes
May 21, 2017
|
No we never undef the targetsocket. Everything else would break too if we did.
… On May 21, 2017, at 3:52 PM, Matt Simerson ***@***.***> wrote:
@msimerson commented on this pull request.
In tls_socket.js:
> @@ -137,6 +137,10 @@ pluggableStream.prototype.setKeepAlive = function (bool) {
pluggableStream.prototype.setNoDelay = function (/* true||false */) {
};
+pluggableStream.prototype.unref = function () {
+ return this.targetsocket.unref();
+};
Could this ever get called while targetsocket is undefined?
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub, or mute the thread.
|
msimerson
added a commit
that referenced
this pull request
Jul 29, 2017
* ignore undefined socket.remoteAddress (#1846) similar to #239 fixes #1835 * URL to manual was 404, point to Plugins.md (#1844) * smtp forward dest split routing (#1847) * split transactions with different forward routing * use tls_ini_section_with_defaults (#1848) * use net_utils.tls_ini_section_with_defaults() fixes #1691 * assure conn/tran still exists before storing results (#1849) * chore(package): update redis to version 2.7.0 (#1854) https://greenkeeper.io/ * fix(package): update ipaddr.js to version 1.3.0 (#1857) https://greenkeeper.io/ * Fix modifier regexp (#1859) * doc typo in config file name (#1865) Actual this is typo in plugin source - it uses "ini" file from another plugin called rabbitmq . So, in fact, no one of the plugins uses config file with name "rabbitmq_amqplib.ini" . This cause error (default values for the plugin) if you trying use the official documentation. * fix(package): update async to version 2.2.0 (#1863) https://greenkeeper.io/ * replace util.inherits with class .. extends (#1862) * replace the discouraged util.inherits with `class Foo extends Bar` syntax * chunkemitter: remove Buffer.concat shim for node < 0.7.11 * fsync_writesteam: moved into ./outbound (only required once) * tls_socket: always set `isServer=true` (an recent merge made it conditional) * removed test for cleartext.getCipher, it *should* always be present * Added RabbitMQ vhost support (#1866) * Add RabbitMQ vhost support Virtual Host. Start with "/". Leave blank or not use if you don't want to use virtual hosts. * Get pool (#1868) * pass cfg object instead, simplifying get_pool * more consistency with variable naming and passing * add integration test: send message w/smtp_client * tls consistency cleanups (#1851) * tls_socket: add options.SNICallback - refresh options.secureContext after setting a different cert in options - plugins/tls: add plugin.loadPemDir - replace some + ‘ ‘ + patterns with string interpolation - replace some `function (a,b) {` patterns with `(a,b) => {` * add very basic tests for tls_socket * move SNI into plugins/tls * revert * tls: remove interim variables (#1871) * - remove interim variables * remove unused _controlReleased * Split delivery relay (#1875) * do not defer relaying clients with split transactions * disable naïve comment stripping (#1876) * disable naïve comment stripping fixes #1874 * tickle travis * fix(package): update async to version 2.3.0 (#1878) https://greenkeeper.io/ * chore(package): update ocsp to version 1.2.0 (#1879) https://greenkeeper.io/ * Added missing 'default' keyword in rspamd plugin. Score wasn't added … (#1856) * Added missing 'default' keyword in rspamd plugin. Score wasn't added properly to header * Logging envelope from / recipients in lowercase in order to avoid changing ES analyzer ( slower performance ) * handle case where OCSP server is unavailable (#1880) this likely fixes #1855 * Add .editorconfig (#1884) * Removing typo from 'relay.md' (#1886) * Fix for issue #1410 (#1887) * Fix for issue #1410 * Remove logging * Confirmed that it works * fixed auth_proxy socket error (#1894) #1893 * Implement the missing upgrade method on SMTPClient. (#1901) * fix(package): update async to version 2.4.0 (#1896) https://greenkeeper.io/ * 1861 binary log (#1902) * Binary log file The log file without that replacement, is interpreted as binary file log issue. * Binary log replace regexp binary replace with code replace * remove variable, line wrap closes 1861 * Outbound split and move into folder (#1850) * Move outbound to its own sub-folder * Start of splitting up outbound into separate files * Progress on splitting * More progress, not working yet * Outbound now seems to work. Tests still fail. * Add missing file * Fix outbound.js test * Fix lint errors * Outbound-Tests for RFC3464 bounce messages reworked (#1889) * fix path to fsync_writestream (./ vs ../) * make sure list_re is defined before access (#1903) * Check error code instead of number. Fixes GH-1895. (#1899) * Bring client pool up to where we were before split (#1915) * Bring client pool up to where we were before split * Add changes from #1848 * Merge in class/extends changes * Fix all logging to be [outbound] prefixed * Fix self logger * Fix net_utils call * fix(package): update sprintf-js to version 1.1.0 (#1906) * F/outbound client certificates (#1908) * Add tls_options and associated tests to queue/smtp_forward * Fix exception when no tls blacklist added. Add tests for smtp_client. * Add documentation for outbound client_certificate * Fix path parsing bug on Windows platform (#1919) * Attempt to add some belt and braces around FIN (#1916) * Attempt to add some belt and braces around FIN * Add logging on write failure * Allow outbound pools to be disabled (#1917) * Allow outbound pools to be disabled * Few changes after actually testing the code * Fix for shutting down clients * Set graceful shutdown off by default (#1927) * Set graceful shutdown off by default Still allow haraka -c <path> --graceful Also sets graceful shutdown to shutdown in max 2xChildren amount of time it sets to shutdown. * Allow gracefulShutdown() to always be graceful Makes the tests pass * Fix comment * Run dumped logs through plugins not console (#1929) * Don't blow the stack on qstat (#1930) * Don't blow the stack on qstat * Should fix another call stack blowing issue * Allow "Unknown Result" and Socket Error to Try Next Host (#1931) * Allow "Unknown Result" and Socket Error to Try Next Host If multiple hosts are listed for clamd and an "unknown result" is returned or a socket error occurs after connection, then attempt to try remaining hosts before returning DENYSOFT. * Remove trailing spaces * Clear off some done tasks (#1928) * Clear off some done tasks * remove completed or abandoned TODO items * Check pool exists before delete (#1937) * Fixes loading outbound under cluster. (#1934) I don't really understand why this stuff broke. It seems to be a bug in node's require() caching, frankly. When loading modules they would return {} before actually being loaded. This appears to be due to recursive requires. This might fix #1933 Please test * Fix cluster messaging for node v6+ (#1938) * Fix undefined variable platformDOT in hmail.js (#1943) * Update qfile.js * Update hmail.js * Update index.js * Fix queue not loaded for single process (#1941) * Fix queue not loaded for single process * Update server.js * Use the sunset keyword in version specific code blocks (#1939) Because `sunset` is the keyword we'll grep for (if we follow our instructions) when doing a semver major release. * Fix PROTOCOL logs that have intermediate \n chars (#1947) Most noted in SpamAssassin output * Load logger in a setImmediate call (#1948) * Bump haraka-results required version (#1949) * Bump haraka-results required version * Update package.json * Fix undefined FsyncWriteStream var (#1953) * Fix undefined FsyncWriteStream var * Update hmail.js * Be more strict in attachment filename matching (#1957) * Be more strict in attachment filename matching This copes with filename="d'euvre" * Add a simple test * Use punycode domain (#1944) * Support SMTPUTF8 properly * Use punycode for mail from too * Enable SMTPUTF8 support * Transaction is null there. Wait until it's set * Add needed utf8 changes to connection.js * punycode for the other addresses * Fix trailing space * Be consistent with todo.domain (#1960) * Minor typo fix (#1963) Thanks * Update package.json (#1968) * Fix unaquired socket errors in test suite (#1971) * Support the new address-rfc2822 (#1970) * Support the new address-rfc2822 New module supports Groups, which have no host method * Force version of rfc2822 required by the fix * Fix missing backslash * RabbitMQ: fix encoding of user and password when creating connection string (#1964) * fix(package): update ipaddr.js to version 1.4.0 (#1972) * Fix link redirection (#1975) * require node LTS version (6+) (#1958) * require node LTS version (6+) * appveyor: install node v6 * whitespace changes for eslint 4 compat (#1979) * whitespace changes for eslint 4 compat * one more ws change * fix(package): update iconv to version 2.3.0 (#1981) * fix(package): update async to version 2.5.0 (#1982) * Add node v8 (#1951) * Add node v8 * enable node v8 testing, permitting v8 failures * import Plugins.md from v3 branch (#1991) * remove logging line (#1985) the prefix is not required in config/plugins as the message states, but it is required for an NPM packaged plugin that requires another NPM packaged plugin and is then spurious * doc: add note that smtp_forward only supports STARTTLS (#1988) * Update qmail-queue.js (#1997) qmail-queue binary Adds a Received: header with bare LF. Haraka sets CRLF by default resulting in mixed line endings which break header processing in some e-mail clients. messagestream can convert CRLF to LF on the fly when calling qmail-send. * rebuild blacklist upon file change (#1990) previously just added new entries fixes 1987 * Remove spurious logs (#1989) * replace plugins/log.elasticsearch with npm packaged (#2004) * replace access with npm packaged haraka-plugin-access (#1992) * use WRITE_EXCL from haraka-constants (#2011) * fix(package): update js-yaml to version 3.9.0 (#2002) * build_todo() is part of the outbound/index.js api (#2016) * rename xclient.hosts to match plugin & docs (#2014) fixes #1265 * correct the config file name to relay.ini (#2012) * fix(package): update semver to version 5.4.0 (#2015) * require node 8 tests to pass (#2017) now that node 8.2+ is on Travis * fixes #1765 (#2013) * Fix auth plugin failure when re-selecting auth method (#2000) When sending the following sequence of commands, the auth plugin fails since it tries to decode an undefined value as base64: AUTH LOGIN Z2lyaXNo 334 UGFzc3dvcmQ6 AUTH LOGIN 500 Unrecognized command # at this point plugin has failed Fixes #1999 * Improve logging UUID tracking in Outbound (#2018) * prep release 2.8.14 (#1932) * prep for next release * update Changes * improve Changes formatting * make the rest of the versions h2 * update Changes
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1926
Changes proposed in this pull request:
graceful_shutdown=true.Checklist: