Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move g to memphis #1056

Merged
merged 6 commits into from
Jun 28, 2023
Merged

Move g to memphis #1056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
be82934
move $G to $memphis and reload logic
shay23b Jun 28, 2023
789d9db
remove comments
shay23b Jun 28, 2023
cbbbbad
fix reloadAuthorization
shay23b Jun 28, 2023
22580e3
fixes
idanasulin2706 Jun 28, 2023
5a646a6
fixes
idanasulin2706 Jun 28, 2023
f791103
fixes
idanasulin2706 Jun 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions analytics/analytics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func InitializeAnalytics(analyticsToken, memphisV, customDeploymentId string) er
if customDeploymentId != "" {
deploymentId = customDeploymentId
} else {
exist, deployment, err := db.GetSystemKey("deployment_id", conf.GlobalAccountName)
exist, deployment, err := db.GetSystemKey("deployment_id", conf.MemphisGlobalAccountName)
if err != nil {
return err
} else if !exist {
Expand All @@ -44,7 +44,7 @@ func InitializeAnalytics(analyticsToken, memphisV, customDeploymentId string) er
return err
}
deploymentId = uid.String()
err = db.InsertSystemKey("deployment_id", deploymentId, conf.GlobalAccountName)
err = db.InsertSystemKey("deployment_id", deploymentId, conf.MemphisGlobalAccountName)
if err != nil {
return err
}
Expand All @@ -53,7 +53,7 @@ func InitializeAnalytics(analyticsToken, memphisV, customDeploymentId string) er
}
}

exist, _, err := db.GetSystemKey("analytics", conf.GlobalAccountName)
exist, _, err := db.GetSystemKey("analytics", conf.MemphisGlobalAccountName)
if err != nil {
return err
} else if !exist {
Expand All @@ -64,7 +64,7 @@ func InitializeAnalytics(analyticsToken, memphisV, customDeploymentId string) er
value = "false"
}

err = db.InsertSystemKey("analytics", value, conf.GlobalAccountName)
err = db.InsertSystemKey("analytics", value, conf.MemphisGlobalAccountName)
if err != nil {
return err
}
Expand All @@ -80,7 +80,7 @@ func InitializeAnalytics(analyticsToken, memphisV, customDeploymentId string) er
}

func Close() {
_, analytics, _ := db.GetSystemKey("analytics", conf.GlobalAccountName)
_, analytics, _ := db.GetSystemKey("analytics", conf.MemphisGlobalAccountName)
if analytics.Value == "true" {
AnalyticsClient.Close()
}
Expand Down
2 changes: 1 addition & 1 deletion conf/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/tkanos/gonfig"
)

const GlobalAccountName = "$G"
const MemphisGlobalAccountName = "$memphis"

type Configuration struct {
DEV_ENV string
Expand Down
1 change: 0 additions & 1 deletion conf/parse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ func ParsePedantic(data string) (map[string]interface{}, error) {
}
return p.mapping, nil
}

// Added by Memphis **

// ParseFileWithChecks is equivalent to ParseFile but runs in pedantic mode.
Expand Down
Loading