remove notification service load test setting

closes CNVS-28905

test plan: message delivery should still work with or without the
service

Change-Id: I9207bd51d839029977988116ee95bb100f56160a
Reviewed-on: https://gerrit.instructure.com/77700
Tested-by: Jenkins
Reviewed-by: Jonathan Featherstone <jfeatherstone@instructure.com>
QA-Review: Gentry Beckmann <gbeckmann@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>

Author: simonista

app/models/message.rb

@@ -562,9 +562,6 @@ def deliver
     end
 
     if user && user.account.feature_enabled?(:notification_service) && path_type != "yo"
-      if Setting.get("notification_service_traffic", nil).present?
-        send(delivery_method)
-      end
       enqueue_to_sqs
     else
       send(delivery_method)
@@ -582,7 +579,7 @@ def enqueue_to_sqs
         path_type,
         target
       )
-      complete_dispatch if Setting.get("notification_service_traffic", nil).nil?
+      complete_dispatch
     end
   rescue AWS::SQS::Errors::Base => e
     Canvas::Errors.capture(
@@ -591,12 +588,10 @@ def enqueue_to_sqs
       to: to,
       object: inspect.to_s
     )
-    if Setting.get("notification_service_traffic", nil).nil?
-      error_string = "Exception: #{e.class}: #{e.message}\n\t#{e.backtrace.join("\n\t")}"
-      self.transmission_errors = error_string
-      self.errored_dispatch
-      raise
-    end
+    error_string = "Exception: #{e.class}: #{e.message}\n\t#{e.backtrace.join("\n\t")}"
+    self.transmission_errors = error_string
+    self.errored_dispatch
+    raise
   end
 
   class RemoteConfigurationError < StandardError; end

spec/lib/services/notification_service_spec.rb

@@ -89,21 +89,6 @@ module Services
         expect(@message.workflow_state).to eql("staged")
       end
 
-      it "will send to both services" do
-        Setting.set("notification_service_traffic", "true")
-        @queue.expects(:send_message).once
-        @message.path_type = "email"
-        @message.expects(:deliver_via_email).once
-        expect{@message.deliver}.not_to raise_error
-      end
-
-      it "does not restage if sending with both methods" do
-        Setting.set("notification_service_traffic", "true")
-        @queue.stubs(:send_message).raises(AWS::SQS::Errors::ServiceError)
-
-        expect{@message.deliver}.not_to raise_error
-      end
-
       context 'payload contents' do
         class SendMessageSpy
           attr_accessor :sent_hash