Merge pull request #5345 from esirK/ft-fix-created-at-bug

Always set app created-at via property instead of introspecting on folder creation time

plugins/apps/functions.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"os"
 	"strings"
+	"time"
 
 	"github.com/dokku/dokku/plugins/common"
 )
@@ -35,6 +36,10 @@ func createApp(appName string) error {
 	common.LogInfo1Quiet(fmt.Sprintf("Creating %s...", appName))
 	os.MkdirAll(common.AppRoot(appName), 0755)
 
+	if err := common.PropertyWrite("apps", appName, "created-at", fmt.Sprintf("%d", time.Now().Unix())); err != nil {
+		return err
+	}
+
 	if err := common.PlugnTrigger("post-create", []string{appName}...); err != nil {
 		return err
 	}

plugins/apps/report.go

@@ -2,7 +2,7 @@ package apps
 
 import (
 	"fmt"
-	"os"
+	"strings"
 
 	"github.com/dokku/dokku/plugins/common"
 )
@@ -33,12 +33,11 @@ func ReportSingleApp(appName string, format string, infoFlag string) error {
 }
 
 func reportCreatedAt(appName string) string {
-	fi, err := os.Stat(common.AppRoot(appName))
+	createdAt, err := common.PropertyListGet("apps", appName, "created-at")
 	if err != nil {
 		return ""
 	}
-
-	return fmt.Sprint(fi.ModTime().Unix())
+	return fmt.Sprint(strings.Join(createdAt, ","))
 }
 
 func reportDeploySource(appName string) string {

plugins/apps/triggers.go

@@ -2,6 +2,8 @@ package apps
 
 import (
 	"fmt"
+	"os"
+	"time"
 
 	"github.com/dokku/dokku/plugins/common"
 )
@@ -41,6 +43,32 @@ func TriggerInstall() error {
 		return fmt.Errorf("Unable to install the apps plugin: %s", err.Error())
 	}
 
+	apps, err := common.UnfilteredDokkuApps()
+	if err != nil {
+		return nil
+	}
+
+	// migrate all created-at values from app mod-time to property
+	for _, appName := range apps {
+		if common.PropertyExists("apps", appName, "created-at") {
+			continue
+		}
+
+		fi, err := os.Stat(common.AppRoot(appName))
+		if err != nil {
+			// if we can't get the time, just write the current one out as a stub
+			if err := common.PropertyWrite("apps", appName, "created-at", fmt.Sprintf("%d", time.Now().Unix())); err != nil {
+				return err
+			}
+
+			continue
+		}
+
+		if err := common.PropertyWrite("apps", appName, "created-at", fmt.Sprintf("%d", fi.ModTime().Unix())); err != nil {
+			return err
+		}
+	}
+
 	return nil
 }