Fixed relevant stats & license trackers to make it easier to use

This commit is contained in:
Frikky
2024-03-18 02:48:53 +01:00
parent c36ed18a04
commit 833a8d53e0
13 changed files with 513 additions and 273 deletions
+2
View File
@@ -969,6 +969,7 @@ func handleInfo(resp http.ResponseWriter, request *http.Request) {
tutorialsFinished = append(tutorialsFinished, tutorial)
}
licensed := shuffle.IsLicensed(ctx, *currentOrg)
returnValue := shuffle.HandleInfo{
Success: true,
@@ -989,6 +990,7 @@ func handleInfo(resp http.ResponseWriter, request *http.Request) {
Tutorials: tutorialsFinished,
Priorities: orgPriorities,
Licensed: licensed,
}
returnData, err := json.Marshal(returnValue)
+26 -3
View File
@@ -293,12 +293,35 @@ func handleGetWorkflowqueue(resp http.ResponseWriter, request *http.Request) {
env, err := shuffle.GetEnvironment(ctx, orgId, "")
timeNow := time.Now().Unix()
if err == nil && len(env.Id) > 0 && len(env.Name) > 0 {
// Updates every 60 seconds~
if time.Now().Unix() > env.Edited+60 {
env.RunningIp = request.RemoteAddr
env.RunningIp = shuffle.GetRequestIp(request)
if len(orborusLabel) > 0 {
env.RunningIp = orborusLabel
}
if request.Method == "POST" {
body, err := ioutil.ReadAll(request.Body)
if err == nil {
var envData shuffle.OrborusStats
err = json.Unmarshal(body, &envData)
if err == nil {
if envData.Swarm {
env.Licensed = true
env.RunType = "docker"
}
if envData.Kubernetes {
env.RunType = "k8s"
}
}
}
}
env.Checkin = timeNow
err = shuffle.SetEnvironment(ctx, env)
err = shuffle.SetEnvironment(ctx, &env)
if err != nil {
log.Printf("[WARNING] Failed updating environment: %s", err)
log.Printf("[ERROR] Failed updating environment: %s", err)
}
}
}