Merge pull request #551 from aau-network-security/develop

aau-network-security · Nov 17, 2020 · 93ada86 · 93ada86
2 parents 7352243 + 0eaee1e
commit 93ada86
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/daemon/event.go b/daemon/event.go
@@ -566,7 +566,7 @@ func (d *daemon) closeEvent(ch chan guacamole.Event, wg *sync.WaitGroup) error {
 		log.Info().Msgf("Running close events, checking %s", e.Tag)
 
 		eTag := store.Tag(e.Tag)
-		if isDelayed(e.FinishExpected.String()) {
+		if isDelayed(e.FinishExpected.Format(displayTimeFormat)) {
 			currentTime := strconv.Itoa(int(time.Now().Unix()))
 			newEventTag := fmt.Sprintf("%s-%s", e.Tag, currentTime)
 			event, err := d.eventPool.GetEvent(eTag)

diff --git a/virtual/docker/docker.go b/virtual/docker/docker.go
@@ -514,6 +514,20 @@ func NewNetwork(isVPN bool) (Network, error) {
 
 	netw, err := DefaultClient.CreateNetwork(conf)
 	if err != nil {
+		for i := 0; ; i++ {
+			attempts := 10
+			netw, err = DefaultClient.CreateNetwork(conf)
+			if err == nil {
+				return nil, nil
+			}
+			if i >= (attempts - 1) {
+				log.Error().Msgf("Lab could not be initialized after %d attempts", attempts)
+				break
+			}
+			time.Sleep(time.Second)
+			log.Error().Msgf("retrying after error: %v", err)
+		}
+		log.Debug().Msgf("Preventing docker overlap pools in case of error tried 10 times...")
 		return nil, fmt.Errorf("docker CreateNetwork err %v", err)
 	}