msimerson / Haraka

17%

master: 17%

LAST BUILD ON BRANCH 962-partial-revert

branch: 962-partial-revert

CHANGE BRANCH

x

Reset

• 962-partial-revert
• 910-results-string
• 945-convo
• 987-http-init
• 987-server-http
• Changes
• Travis-docker
• access
• access-logmsg
• access-test
• access-typo
• address
• appveyor
• asn
• asn-docs
• async-1.0
• attachment
• attachment-cfg
• attachment-faster
• auth-results
• auth_base
• auth_base-results
• auth_vpopmail
• avg
• avg-noop
• bounce
• bug_873
• cfreader
• cfreader-cache
• cfreader-cache2
• cfreader-lite
• cfreader-ws
• changes
• changes-prep-2.7.0
• char-encode
• clamav-noop
• clamd-reject
• cleanup-docs
• cleanups
• cleanups-more
• codeclimate
• config-empty-value-permissible
• config-plugins
• config-plugins-docs
• config-plugins-order
• config-tests
• config-type
• configfile
• connect.geoip
• connection
• connection-crash
• connection-dry
• connection-early-talker
• connection-errors
• connection-noop
• connection-queue-msg
• connection-results
• convo
• coveralls
• dev-2.6.2-4
• discard
• dkim
• dkim_sign
• dmarc
• dns_list
• dns_list_base
• dns_utils
• dnsbl-error-msg
• dnswl
• docs
• drop-node-0.8
• dsn_fix-test
• early-talker
• early_talker
• fcrdns
• fcrdns-enodata
• fcrdns-ptr-valid
• fs-watch
• fs-watch-cb
• geoip
• geoip-reportas
• graph-deprecate
• grunt
• haproxy-ipv6
• headers
• headers-two-more
• http-server
• iconv_lite
• iojs
• ipv6-rfc1918
• is_ip_in_str
• karma
• karma-dnsbl
• karma-messages
• karma-mf
• karma-minus-concurrent
• karma-noop
• karma-pruning
• karma-skip-outbound
• karma-tests
• karma2
• limit
• limit.ini
• line-endings
• line_socket
• lint
• log-elasticsearch
• log-reader
• malware-config-speedup
• master
• mfr
• net_utils
• net_utils.get_ipany_re
• net_utils.get_ips_by_host
• node-0.8
• noop
• nosql
• outbound
• outbound-lint
• p0f
• plugin-dir
• plugins
• plugins-from-node_modules
• plugins-test
• plugins.noop
• prep-release-2.7.0
• public-suffix-list
• rcpt.ldap
• rcpt.routes
• readme
• redis-plugin
• regex-improve-ipv6
• relaying
• reponse
• result_store
• result_store-array-array
• result_store-envelope
• result_store-hidden
• results-has-num-bool
• results-redis
• results-string
• routes
• rspamd
• rspamd-bugfix
• rspamd-missing-plugin
• server
• server-http-init
• server-noop
• smtp_client
• smtp_client2
• smtp_client3
• smtp_client4
• smtp_forward
• smtp_forward-noop
• spamassassin
• spf-test-noise
• syslog-strongloop
• test-cleanups
• tls
• tls-notls-after-failure
• toaster
• todo
• toobusy
• travis
• ubuntu
• uribl-call_next
• uribl-doc
• uribl-multiple-callback
• utils
• utils-elapsed
• vim-droppings
• watch
• watch-http
• watch-http-init
• watch-updates
• windows-compat

Build # 1492

Build Type

push

travis-ci

Committed by msimerson

Commit Message

smtp_forward: revert part of #962 w/overlap #950

two changes:

1. Don't save txn results (redundant with #950)
2. Don't append txn ID to queue message

Question: Is there any reason for the txn ID to be appended? Log
messages are already prefixed with the txn ID and txn results already have
the txn ID available, so at that point, it's entirely redundant data.

Near as I can tell, the only reason to append it there is so that it's
returned to the sending MTA in queue_*_respond. If that's the case, I'd rather
append it there.

Thoughts?

* connection: append uuid *after* saving to results store

Run Details

1 of 6 relevant lines covered (16.67%)

0.67 hits per line