{"action":"created","comment":{"url":"https://api.github.com/repos/Particular/NServiceBus/pulls/comments/70249963","id":70249963,"diff_hunk":"@@ -28,66 +29,65 @@ public Recoverability()\n                 settings.SetDefault(SlrTimeIncrease, DefaultSecondLevelRetryPolicy.DefaultTimeIncrease);\n \n                 settings.SetDefault(FlrNumberOfRetries, 5);\n-\n-                settings.SetDefault(FailureInfoStorageCacheSizeKey, 1000);\n             });\n         }\n+\n         protected internal override void Setup(FeatureConfigurationContext context)\n         {\n             var errorQueue = context.Settings.ErrorQueueAddress();\n             context.Settings.Get<QueueBindings>().BindSending(errorQueue);\n \n-            var failureInfoStorage = new FailureInfoStorage(context.Settings.Get<int>(FailureInfoStorageCacheSizeKey));\n-            var localAddress = context.Settings.LocalAddress();\n+            var transportTransactionMode = context.Settings.GetRequiredTransactionModeForReceives();\n+\n+            if (transportTransactionMode == TransportTransactionMode.None)\n+            {\n+                Logger.Warn(\"First and Second Level Retries will be disabled. Automatic retries are not supported when running with TransportTransactionMode.None. Failed messages will be moved to the error queue instead.\");\n+            }\n \n-            context.Pipeline.Register(\"Recoverability\", b =>\n+            context.Container.ConfigureComponent(b =>\n             {\n-                var hostInfo = b.Build<HostInformation>();\n-                var staticFaultMetadata = new Dictionary<string, string>\n+                Func<string, MoveToErrorsExecutor> moveToErrorsExecutorFactory = localAddress =>\n                 {\n-                    {FaultsHeaderKeys.FailedQ, localAddress},\n-                    {Headers.ProcessingMachine, RuntimeEnvironment.MachineName },\n-                    {Headers.ProcessingEndpoint, context.Settings.EndpointName()},\n-                    {Headers.HostId, hostInfo.HostId.ToString(\"N\")},\n-                    {Headers.HostDisplayName, hostInfo.DisplayName}\n+                    var hostInfo = b.Build<HostInformation>();\n+                    var staticFaultMetadata = new Dictionary<string, string>\n+                    {\n+                        {FaultsHeaderKeys.FailedQ, localAddress},\n+                        {Headers.ProcessingMachine, RuntimeEnvironment.MachineName},\n+                        {Headers.ProcessingEndpoint, context.Settings.EndpointName()},\n+                        {Headers.HostId, hostInfo.HostId.ToString(\"N\")},\n+                        {Headers.HostDisplayName, hostInfo.DisplayName}\n+                    };\n+\n+                    return new MoveToErrorsExecutor(b.Build<IDispatchMessages>(), errorQueue, staticFaultMetadata);\n                 };\n \n-                var recoveryActionExecutor = new MoveToErrorsActionExecutor(b.Build<IDispatchMessages>(), errorQueue, staticFaultMetadata);\n-\n-                var errorBehavior = new MoveFaultsToErrorQueueHandler(\n-                    b.Build<CriticalError>(),\n-                    failureInfoStorage,\n-                    recoveryActionExecutor);\n-\n-                SecondLevelRetriesHandler slrHandler = null;\n-\n-                if (IsDelayedRetriesEnabled(context.Settings))\n+                var delayedRetriesEnabled = IsDelayedRetriesEnabled(context.Settings);\n+                Func<string, DelayedRetryExecutor> delayedRetryExecutorFactory = localAddress =>","path":"src/NServiceBus.Core/Recoverability/Recoverability.cs","position":71,"original_position":71,"commit_id":"88d6d7cf63e742fba4e6b20b3d752f562776222f","original_commit_id":"63755797d5ce905ea71d8a0a70f06a940bf5356c","user":{"login":"timbussmann","id":3524870,"avatar_url":"https://avatars.githubusercontent.com/u/3524870?v=3","gravatar_id":"","url":"https://api.github.com/users/timbussmann","html_url":"https://github.com/timbussmann","followers_url":"https://api.github.com/users/timbussmann/followers","following_url":"https://api.github.com/users/timbussmann/following{/other_user}","gists_url":"https://api.github.com/users/timbussmann/gists{/gist_id}","starred_url":"https://api.github.com/users/timbussmann/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/timbussmann/subscriptions","organizations_url":"https://api.github.com/users/timbussmann/orgs","repos_url":"https://api.github.com/users/timbussmann/repos","events_url":"https://api.github.com/users/timbussmann/events{/privacy}","received_events_url":"https://api.github.com/users/timbussmann/received_events","type":"User","site_admin":false},"body":"if it were only the queue names, I'd have suggest to put that on the context instead.","created_at":"2016-07-11T12:45:46Z","updated_at":"2016-07-11T12:45:46Z","html_url":"https://github.com/Particular/NServiceBus/pull/3892#discussion_r70249963","pull_request_url":"https://api.github.com/repos/Particular/NServiceBus/pulls/3892","_links":{"self":{"href":"https://api.github.com/repos/Particular/NServiceBus/pulls/comments/70249963"},"html":{"href":"https://github.com/Particular/NServiceBus/pull/3892#discussion_r70249963"},"pull_request":{"href":"https://api.github.com/repos/Particular/NServiceBus/pulls/3892"}}},"pull_request":{"url":"https://api.github.com/repos/Particular/NServiceBus/pulls/3892","id":75793516,"html_url":"https://github.com/Particular/NServiceBus/pull/3892","diff_url":"https://github.com/Particular/NServiceBus/pull/3892.diff","patch_url":"https://github.com/Particular/NServiceBus/pull/3892.patch","issue_url":"https://api.github.com/repos/Particular/NServiceBus/issues/3892","number":3892,"state":"open","locked":false,"title":"New recoverability mechanism","user":{"login":"tmasternak","id":1092707,"avatar_url":"https://avatars.githubusercontent.com/u/1092707?v=3","gravatar_id":"","url":"https://api.github.com/users/tmasternak","html_url":"https://github.com/tmasternak","followers_url":"https://api.github.com/users/tmasternak/followers","following_url":"https://api.github.com/users/tmasternak/following{/other_user}","gists_url":"https://api.github.com/users/tmasternak/gists{/gist_id}","starred_url":"https://api.github.com/users/tmasternak/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tmasternak/subscriptions","organizations_url":"https://api.github.com/users/tmasternak/orgs","repos_url":"https://api.github.com/users/tmasternak/repos","events_url":"https://api.github.com/users/tmasternak/events{/privacy}","received_events_url":"https://api.github.com/users/tmasternak/received_events","type":"User","site_admin":false},"body":"Connects to https://github.com/Particular/V6Launch/issues/69\r\n\r\n/cc: @timbussmann @andreasohlund ","created_at":"2016-06-30T10:13:26Z","updated_at":"2016-07-11T12:45:46Z","closed_at":null,"merged_at":null,"merge_commit_sha":"e9d7157949db5ceed5e59e943ddc5b6a96391049","assignee":null,"assignees":[],"milestone":null,"commits_url":"https://api.github.com/repos/Particular/NServiceBus/pulls/3892/commits","review_comments_url":"https://api.github.com/repos/Particular/NServiceBus/pulls/3892/comments","review_comment_url":"https://api.github.com/repos/Particular/NServiceBus/pulls/comments{/number}","comments_url":"https://api.github.com/repos/Particular/NServiceBus/issues/3892/comments","statuses_url":"https://api.github.com/repos/Particular/NServiceBus/statuses/88d6d7cf63e742fba4e6b20b3d752f562776222f","head":{"label":"Particular:recoverability-policy","ref":"recoverability-policy","sha":"88d6d7cf63e742fba4e6b20b3d752f562776222f","user":{"login":"Particular","id":5038441,"avatar_url":"https://avatars.githubusercontent.com/u/5038441?v=3","gravatar_id":"","url":"https://api.github.com/users/Particular","html_url":"https://github.com/Particular","followers_url":"https://api.github.com/users/Particular/followers","following_url":"https://api.github.com/users/Particular/following{/other_user}","gists_url":"https://api.github.com/users/Particular/gists{/gist_id}","starred_url":"https://api.github.com/users/Particular/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Particular/subscriptions","organizations_url":"https://api.github.com/users/Particular/orgs","repos_url":"https://api.github.com/users/Particular/repos","events_url":"https://api.github.com/users/Particular/events{/privacy}","received_events_url":"https://api.github.com/users/Particular/received_events","type":"Organization","site_admin":false},"repo":{"id":1056713,"name":"NServiceBus","full_name":"Particular/NServiceBus","owner":{"login":"Particular","id":5038441,"avatar_url":"https://avatars.githubusercontent.com/u/5038441?v=3","gravatar_id":"","url":"https://api.github.com/users/Particular","html_url":"https://github.com/Particular","followers_url":"https://api.github.com/users/Particular/followers","following_url":"https://api.github.com/users/Particular/following{/other_user}","gists_url":"https://api.github.com/users/Particular/gists{/gist_id}","starred_url":"https://api.github.com/users/Particular/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Particular/subscriptions","organizations_url":"https://api.github.com/users/Particular/orgs","repos_url":"https://api.github.com/users/Particular/repos","events_url":"https://api.github.com/users/Particular/events{/privacy}","received_events_url":"https://api.github.com/users/Particular/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/Particular/NServiceBus","description":"The most popular service bus for .NET","fork":false,"url":"https://api.github.com/repos/Particular/NServiceBus","forks_url":"https://api.github.com/repos/Particular/NServiceBus/forks","keys_url":"https://api.github.com/repos/Particular/NServiceBus/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Particular/NServiceBus/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Particular/NServiceBus/teams","hooks_url":"https://api.github.com/repos/Particular/NServiceBus/hooks","issue_events_url":"https://api.github.com/repos/Particular/NServiceBus/issues/events{/number}","events_url":"https://api.github.com/repos/Particular/NServiceBus/events","assignees_url":"https://api.github.com/repos/Particular/NServiceBus/assignees{/user}","branches_url":"https://api.github.com/repos/Particular/NServiceBus/branches{/branch}","tags_url":"https://api.github.com/repos/Particular/NServiceBus/tags","blobs_url":"https://api.github.com/repos/Particular/NServiceBus/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Particular/NServiceBus/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Particular/NServiceBus/git/refs{/sha}","trees_url":"https://api.github.com/repos/Particular/NServiceBus/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Particular/NServiceBus/statuses/{sha}","languages_url":"https://api.github.com/repos/Particular/NServiceBus/languages","stargazers_url":"https://api.github.com/repos/Particular/NServiceBus/stargazers","contributors_url":"https://api.github.com/repos/Particular/NServiceBus/contributors","subscribers_url":"https://api.github.com/repos/Particular/NServiceBus/subscribers","subscription_url":"https://api.github.com/repos/Particular/NServiceBus/subscription","commits_url":"https://api.github.com/repos/Particular/NServiceBus/commits{/sha}","git_commits_url":"https://api.github.com/repos/Particular/NServiceBus/git/commits{/sha}","comments_url":"https://api.github.com/repos/Particular/NServiceBus/comments{/number}","issue_comment_url":"https://api.github.com/repos/Particular/NServiceBus/issues/comments{/number}","contents_url":"https://api.github.com/repos/Particular/NServiceBus/contents/{+path}","compare_url":"https://api.github.com/repos/Particular/NServiceBus/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Particular/NServiceBus/merges","archive_url":"https://api.github.com/repos/Particular/NServiceBus/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Particular/NServiceBus/downloads","issues_url":"https://api.github.com/repos/Particular/NServiceBus/issues{/number}","pulls_url":"https://api.github.com/repos/Particular/NServiceBus/pulls{/number}","milestones_url":"https://api.github.com/repos/Particular/NServiceBus/milestones{/number}","notifications_url":"https://api.github.com/repos/Particular/NServiceBus/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Particular/NServiceBus/labels{/name}","releases_url":"https://api.github.com/repos/Particular/NServiceBus/releases{/id}","deployments_url":"https://api.github.com/repos/Particular/NServiceBus/deployments","created_at":"2010-11-06T12:54:52Z","updated_at":"2016-07-09T19:25:21Z","pushed_at":"2016-07-11T12:13:15Z","git_url":"git://github.com/Particular/NServiceBus.git","ssh_url":"git@github.com:Particular/NServiceBus.git","clone_url":"https://github.com/Particular/NServiceBus.git","svn_url":"https://github.com/Particular/NServiceBus","homepage":"http://particular.net/nservicebus","size":178565,"stargazers_count":941,"watchers_count":941,"language":"C#","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":507,"mirror_url":null,"open_issues_count":244,"forks":507,"open_issues":244,"watchers":941,"default_branch":"develop"}},"base":{"label":"Particular:release-6.0.0","ref":"release-6.0.0","sha":"fa13b5c1feb7ec0c8acb29620bb0aebae3ad88a6","user":{"login":"Particular","id":5038441,"avatar_url":"https://avatars.githubusercontent.com/u/5038441?v=3","gravatar_id":"","url":"https://api.github.com/users/Particular","html_url":"https://github.com/Particular","followers_url":"https://api.github.com/users/Particular/followers","following_url":"https://api.github.com/users/Particular/following{/other_user}","gists_url":"https://api.github.com/users/Particular/gists{/gist_id}","starred_url":"https://api.github.com/users/Particular/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Particular/subscriptions","organizations_url":"https://api.github.com/users/Particular/orgs","repos_url":"https://api.github.com/users/Particular/repos","events_url":"https://api.github.com/users/Particular/events{/privacy}","received_events_url":"https://api.github.com/users/Particular/received_events","type":"Organization","site_admin":false},"repo":{"id":1056713,"name":"NServiceBus","full_name":"Particular/NServiceBus","owner":{"login":"Particular","id":5038441,"avatar_url":"https://avatars.githubusercontent.com/u/5038441?v=3","gravatar_id":"","url":"https://api.github.com/users/Particular","html_url":"https://github.com/Particular","followers_url":"https://api.github.com/users/Particular/followers","following_url":"https://api.github.com/users/Particular/following{/other_user}","gists_url":"https://api.github.com/users/Particular/gists{/gist_id}","starred_url":"https://api.github.com/users/Particular/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Particular/subscriptions","organizations_url":"https://api.github.com/users/Particular/orgs","repos_url":"https://api.github.com/users/Particular/repos","events_url":"https://api.github.com/users/Particular/events{/privacy}","received_events_url":"https://api.github.com/users/Particular/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/Particular/NServiceBus","description":"The most popular service bus for .NET","fork":false,"url":"https://api.github.com/repos/Particular/NServiceBus","forks_url":"https://api.github.com/repos/Particular/NServiceBus/forks","keys_url":"https://api.github.com/repos/Particular/NServiceBus/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Particular/NServiceBus/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Particular/NServiceBus/teams","hooks_url":"https://api.github.com/repos/Particular/NServiceBus/hooks","issue_events_url":"https://api.github.com/repos/Particular/NServiceBus/issues/events{/number}","events_url":"https://api.github.com/repos/Particular/NServiceBus/events","assignees_url":"https://api.github.com/repos/Particular/NServiceBus/assignees{/user}","branches_url":"https://api.github.com/repos/Particular/NServiceBus/branches{/branch}","tags_url":"https://api.github.com/repos/Particular/NServiceBus/tags","blobs_url":"https://api.github.com/repos/Particular/NServiceBus/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Particular/NServiceBus/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Particular/NServiceBus/git/refs{/sha}","trees_url":"https://api.github.com/repos/Particular/NServiceBus/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Particular/NServiceBus/statuses/{sha}","languages_url":"https://api.github.com/repos/Particular/NServiceBus/languages","stargazers_url":"https://api.github.com/repos/Particular/NServiceBus/stargazers","contributors_url":"https://api.github.com/repos/Particular/NServiceBus/contributors","subscribers_url":"https://api.github.com/repos/Particular/NServiceBus/subscribers","subscription_url":"https://api.github.com/repos/Particular/NServiceBus/subscription","commits_url":"https://api.github.com/repos/Particular/NServiceBus/commits{/sha}","git_commits_url":"https://api.github.com/repos/Particular/NServiceBus/git/commits{/sha}","comments_url":"https://api.github.com/repos/Particular/NServiceBus/comments{/number}","issue_comment_url":"https://api.github.com/repos/Particular/NServiceBus/issues/comments{/number}","contents_url":"https://api.github.com/repos/Particular/NServiceBus/contents/{+path}","compare_url":"https://api.github.com/repos/Particular/NServiceBus/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Particular/NServiceBus/merges","archive_url":"https://api.github.com/repos/Particular/NServiceBus/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Particular/NServiceBus/downloads","issues_url":"https://api.github.com/repos/Particular/NServiceBus/issues{/number}","pulls_url":"https://api.github.com/repos/Particular/NServiceBus/pulls{/number}","milestones_url":"https://api.github.com/repos/Particular/NServiceBus/milestones{/number}","notifications_url":"https://api.github.com/repos/Particular/NServiceBus/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Particular/NServiceBus/labels{/name}","releases_url":"https://api.github.com/repos/Particular/NServiceBus/releases{/id}","deployments_url":"https://api.github.com/repos/Particular/NServiceBus/deployments","created_at":"2010-11-06T12:54:52Z","updated_at":"2016-07-09T19:25:21Z","pushed_at":"2016-07-11T12:13:15Z","git_url":"git://github.com/Particular/NServiceBus.git","ssh_url":"git@github.com:Particular/NServiceBus.git","clone_url":"https://github.com/Particular/NServiceBus.git","svn_url":"https://github.com/Particular/NServiceBus","homepage":"http://particular.net/nservicebus","size":178565,"stargazers_count":941,"watchers_count":941,"language":"C#","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":507,"mirror_url":null,"open_issues_count":244,"forks":507,"open_issues":244,"watchers":941,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/Particular/NServiceBus/pulls/3892"},"html":{"href":"https://github.com/Particular/NServiceBus/pull/3892"},"issue":{"href":"https://api.github.com/repos/Particular/NServiceBus/issues/3892"},"comments":{"href":"https://api.github.com/repos/Particular/NServiceBus/issues/3892/comments"},"review_comments":{"href":"https://api.github.com/repos/Particular/NServiceBus/pulls/3892/comments"},"review_comment":{"href":"https://api.github.com/repos/Particular/NServiceBus/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/Particular/NServiceBus/pulls/3892/commits"},"statuses":{"href":"https://api.github.com/repos/Particular/NServiceBus/statuses/88d6d7cf63e742fba4e6b20b3d752f562776222f"}}}}
{"actor":{"display_login":"timbussmann"}}