mirror of
https://github.com/glanceapp/glance.git
synced 2025-06-21 18:31:24 +02:00
Merge pull request #456 from slashformotion/slashformotion/refactor
refacto: remove duplicate
This commit is contained in:
commit
4731b90899
@ -103,7 +103,7 @@ func runDiagnostic() {
|
|||||||
fmt.Println("Glance version: " + buildVersion)
|
fmt.Println("Glance version: " + buildVersion)
|
||||||
fmt.Println("Go version: " + runtime.Version())
|
fmt.Println("Go version: " + runtime.Version())
|
||||||
fmt.Printf("Platform: %s / %s / %d CPUs\n", runtime.GOOS, runtime.GOARCH, runtime.NumCPU())
|
fmt.Printf("Platform: %s / %s / %d CPUs\n", runtime.GOOS, runtime.GOARCH, runtime.NumCPU())
|
||||||
fmt.Println("In Docker container: " + boolToString(isRunningInsideDockerContainer(), "yes", "no"))
|
fmt.Println("In Docker container: " + ternary(isRunningInsideDockerContainer(), "yes", "no"))
|
||||||
|
|
||||||
fmt.Printf("\nChecking network connectivity, this may take up to %d seconds...\n\n", int(httpTestRequestTimeout.Seconds()))
|
fmt.Printf("\nChecking network connectivity, this may take up to %d seconds...\n\n", int(httpTestRequestTimeout.Seconds()))
|
||||||
|
|
||||||
@ -129,7 +129,7 @@ func runDiagnostic() {
|
|||||||
|
|
||||||
fmt.Printf(
|
fmt.Printf(
|
||||||
"%s %s %s| %dms\n",
|
"%s %s %s| %dms\n",
|
||||||
boolToString(step.err == nil, "✓ Can", "✗ Can't"),
|
ternary(step.err == nil, "✓ Can", "✗ Can't"),
|
||||||
step.name,
|
step.name,
|
||||||
extraInfo,
|
extraInfo,
|
||||||
step.elapsed.Milliseconds(),
|
step.elapsed.Milliseconds(),
|
||||||
|
@ -119,14 +119,6 @@ func parseRFC3339Time(t string) time.Time {
|
|||||||
return parsed
|
return parsed
|
||||||
}
|
}
|
||||||
|
|
||||||
func boolToString(b bool, trueValue, falseValue string) string {
|
|
||||||
if b {
|
|
||||||
return trueValue
|
|
||||||
}
|
|
||||||
|
|
||||||
return falseValue
|
|
||||||
}
|
|
||||||
|
|
||||||
func normalizeVersionFormat(version string) string {
|
func normalizeVersionFormat(version string) string {
|
||||||
version = strings.ToLower(strings.TrimSpace(version))
|
version = strings.ToLower(strings.TrimSpace(version))
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user