#200 #198 initialize part before console command, import path and wait group for event async

Author: jeevatkm

aah.go

@@ -477,12 +477,19 @@ func (a *Application) ValidateValue(v interface{}, rules string) bool {
 // If anything goes wrong during an initialize process, it would return an error.
 func (a *Application) Run(args []string) error {
 	var err error
+	a.settings.SetImportPath(args) // only needed for development via CLI
 	if err = a.initPath(); err != nil {
 		return err
 	}
 	if err = a.initConfig(); err != nil {
 		return err
 	}
+	if err = a.settings.Refresh(a.Config()); err != nil {
+		return err
+	}
+	if err = a.initLog(); err != nil {
+		return err
+	}
 	a.initCli()
 	return a.cli.Run(args)
 }
@@ -564,14 +571,7 @@ func (a *Application) initApp() error {
 	for event := range a.EventStore().subscribers {
 		a.EventStore().sortEventSubscribers(event)
 	}
-	// publish `OnInit` server event
-	a.EventStore().PublishSync(&Event{Name: EventOnInit})
-	if err = a.settings.Refresh(a.Config()); err != nil {
-		return err
-	}
-	if err = a.initLog(); err != nil {
-		return err
-	}
+	a.EventStore().PublishSync(&Event{Name: EventOnInit}) // publish `OnInit` server event
 	if err = a.initI18n(); err != nil {
 		return err
 	}

aah_test.go

@@ -394,6 +394,10 @@ func newTestApp(t *testing.T, importPath string) *Application {
 	assert.Nil(t, err, "app initPath failure")
 	err = a.initConfig()
 	assert.Nil(t, err, "app initConfig failure")
+	err = a.settings.Refresh(a.Config())
+	assert.Nil(t, err, "app settings failure")
+	err = a.initLog()
+	assert.Nil(t, err, "app log failure")
 	err = a.initApp()
 	assert.Nil(t, err, "app init failure")
 

commands.go

@@ -101,7 +101,6 @@ func (a *Application) cliCmdRun() console.Command {
 		},
 		Action: func(c *console.Context) error {
 			a.Log().Infof("aah framework v%s, requires >= go1.11", a.BuildInfo().AahVersion)
-			a.settings.ImportPath = c.String("importpath")
 
 			// External config file
 			extCfgFile := c.String("config")

event.go

@@ -227,23 +227,29 @@ func (es *EventStore) Publish(e *Event) {
 		return
 	}
 	es.a.Log().Debugf("Publishing event '%s' in asynchronous mode", e.Name)
+	wg := sync.WaitGroup{}
 	for idx, ec := range es.subscribers[e.Name] {
 		if ec.CallOnce {
 			if !ec.published {
-				go func(event *Event, ecb EventCallbackFunc) {
+				wg.Add(1)
+				go func(w *sync.WaitGroup, event *Event, ecb EventCallbackFunc) {
+					defer w.Done()
 					ecb(event)
-				}(e, ec.Callback)
+				}(&wg, e, ec.Callback)
 				es.mu.Lock()
 				es.subscribers[e.Name][idx].published = true
 				es.mu.Unlock()
 			}
 			continue
 		}
 
-		go func(event *Event, ecb EventCallbackFunc) {
+		wg.Add(1)
+		go func(w *sync.WaitGroup, event *Event, ecb EventCallbackFunc) {
+			defer w.Done()
 			ecb(event)
-		}(e, ec.Callback)
+		}(&wg, e, ec.Callback)
 	}
+	wg.Wait()
 }
 
 // PublishSync method publishes events to subscribed callbacks synchronously.

internal/settings/settings.go

@@ -165,6 +165,16 @@ func (s *Settings) Refresh(cfg *config.Config) error {
 	return nil
 }
 
+// SetImportPath method process import path and sets it into settings instance.
+func (s *Settings) SetImportPath(args []string) {
+	for i, arg := range args {
+		if arg == "--importpath" {
+			s.ImportPath = args[i+1]
+			break
+		}
+	}
+}
+
 // SetEnvProfile method is to set application environment profile value.
 func (s *Settings) setEnvProfile(p string) error {
 	if !strings.HasPrefix(p, ProfilePrefix) {