From 55ec8e07c02e651320543c8089186bf34404066e Mon Sep 17 00:00:00 2001 From: Urban Klinc Date: Thu, 26 Nov 2020 10:23:06 +0100 Subject: [PATCH] Apply change options to app init proc --- app/options.go | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/app/options.go b/app/options.go index 4260988d1..e957b7238 100644 --- a/app/options.go +++ b/app/options.go @@ -24,29 +24,23 @@ type ( } ) -func NewOptions(prefix ...string) *Options { - var p = "" - if len(prefix) > 0 { - p = prefix[0] - } +func NewOptions() *Options { - // @todo remover prefixes on opt constructors and - // pass in EnvironmentOpt so we can have environment-dependant defaults return &Options{ Environment: *options.Environment(), ActionLog: *options.ActionLog(), Auth: *options.Auth(), - SMTP: *options.SMTP(p), - HTTPClient: *options.HttpClient(p), - DB: *options.DB(p), - Upgrade: *options.Upgrade(p), - Provision: *options.Provision(p), - Sentry: *options.Sentry(p), - ObjStore: *options.ObjectStore(p), + SMTP: *options.SMTP(), + HTTPClient: *options.HTTPClient(), + DB: *options.DB(), + Upgrade: *options.Upgrade(), + Provision: *options.Provision(), + Sentry: *options.Sentry(), + ObjStore: *options.ObjectStore(), Corredor: *options.Corredor(), - Monitor: *options.Monitor(p), - WaitFor: *options.WaitFor(p), - HTTPServer: *options.HTTP(p), - Websocket: *options.Websocket(p), + Monitor: *options.Monitor(), + WaitFor: *options.WaitFor(), + HTTPServer: *options.HTTPServer(), + Websocket: *options.Websocket(), } }