apps/ecs
1
0
Fork 0
mirror of https://github.com/oneclickvirt/ecs.git synced 2025-10-04 15:02:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
spiritysdx
2024-06-25 19:28:51 +08:00
parent 762c88d7f6
commit 606e1fc3cd
11 changed files with 128 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
backtrace/ecs.log Normal file
View File

2
basic/basic_test.go
View File

@@ -3,5 +3,5 @@ package basic
import "testing"
func Test_basic(t *testing.T) {
basic()
Basic("zh")
}

7
basic/basiccheck.go
View File

@@ -11,11 +11,10 @@ import (
// TODO
// 迁移Shell的完整检测逻辑使用执行命令的方式查询，最后都失败才使用gopsutil查询
func basic() {
language := "zh"
func Basic(language string) {
ipInfo, _, _ := network.NetworkCheck("both", false, language)
res := system.CheckSystemInfo(language)
fmt.Println("--------------------------------------------------")
//fmt.Println("--------------------------------------------------")
fmt.Printf(strings.ReplaceAll(res+ipInfo, "\n\n", "\n"))
fmt.Println("--------------------------------------------------")
//fmt.Println("--------------------------------------------------")
}

31
cputest/cputest.go
View File

@@ -3,10 +3,33 @@ package cputest
import (
"fmt"
"github.com/oneclickvirt/cputest/cpu"
"runtime"
)
func cputest() {
//res := cpu.SysBenchTest("zh", "1")
res := cpu.WinsatTest("zh", "1")
fmt.Println(res)
func CpuTest(language, testMethod, testThread string) {
var res string
if runtime.GOOS == "windows" {
if testMethod != "winsat" && testMethod != "" {
res = "Detected host is Windows, using Winsat for testing.\n"
}
res += cpu.WinsatTest(language, testThread)
} else {
switch testMethod {
case "sysbench":
res = cpu.SysBenchTest(language, testThread)
if res == "" {
res = "Sysbench test failed, switching to Geekbench for testing.\n"
res += cpu.GeekBenchTest(language, testThread)
}
case "geekbench":
res = cpu.GeekBenchTest(language, testThread)
if res == "" {
res = "Geekbench test failed, switching to Sysbench for testing.\n"
res += cpu.SysBenchTest(language, testThread)
}
default:
res = "Invalid test method specified.\n"
}
}
fmt.Print(res)
}

2
cputest/cputest_test.go
View File

@@ -5,5 +5,5 @@ import (
)
func Test(t *testing.T) {
cputest()
CpuTest("zh", "sysbench", "1")
}

33
disktest/disktest.go
View File

@@ -6,19 +6,32 @@ import (
"runtime"
)
func diskIoTest() {
var language, res string
language = "zh"
isMultiCheck := false
func DiskTest(language, testMethod, testPath string, isMultiCheck bool) {
var res string
if runtime.GOOS == "windows" {
res = disk.WinsatTest(language, isMultiCheck, "")
if testMethod != "winsat" && testMethod != "" {
res = "Detected host is Windows, using Winsat for testing.\n"
}
res = disk.WinsatTest(language, isMultiCheck, testPath)
} else {
res = disk.FioTest(language, isMultiCheck, "")
if res == "" {
res = disk.DDTest(language, isMultiCheck, "")
switch testMethod {
case "fio":
res = disk.FioTest(language, isMultiCheck, testPath)
if res == "" {
res = "Fio test failed, switching to DD for testing.\n"
res += disk.DDTest(language, isMultiCheck, testPath)
}
case "dd":
res = disk.DDTest(language, isMultiCheck, testPath)
if res == "" {
res = "DD test failed, switching to Fio for testing.\n"
res += disk.FioTest(language, isMultiCheck, testPath)
}
default:
res = "Unsupported test method specified.\n"
}
}
fmt.Println("--------------------------------------------------")
//fmt.Println("--------------------------------------------------")
fmt.Printf(res)
fmt.Println("--------------------------------------------------")
//fmt.Println("--------------------------------------------------")
}

2
disktest/disktest_test.go
View File

@@ -3,5 +3,5 @@ package disktest
import "testing"
func TestDiskIoTest(t *testing.T) {
diskIoTest()
DiskTest("zh", "", false)
}

60
main.go
View File

@@ -1,12 +1,60 @@
package main
import (
. "github.com/oneclickvirt/ecs/defaultset"
"flag"
"fmt"
"github.com/oneclickvirt/ecs/basic"
"github.com/oneclickvirt/ecs/cputest"
"github.com/oneclickvirt/ecs/disktest"
"github.com/oneclickvirt/ecs/memorytest"
"strings"
"unicode/utf8"
)
func main() {
InitLogger()
defer Logger.Sync()
Logger.Info("Start logging")
// Logger.Info("Your log message", zap.Any("key", value))
func printCenteredTitle(title string, width int) {
titleLength := utf8.RuneCountInString(title) // 计算字符串的字符数
totalPadding := width - titleLength
padding := totalPadding / 2
paddingStr := strings.Repeat("-", padding)
fmt.Println(paddingStr + title + paddingStr + strings.Repeat("-", totalPadding%2))
}
func main() {
var (
ecsVersion = "2024.06.25"
showVersion bool
language string
cpuTestMethod, cpuTestThread string
memoryTestMethod string
diskTestMethod, diskTestPath string
diskMultiCheck bool
width = 80
)
flag.BoolVar(&showVersion, "v", false, "Show version information")
flag.StringVar(&language, "l", "zh", "Specify language (supported: en, zh)")
flag.StringVar(&cpuTestMethod, "cpum", "sysbench", "Specify CPU test method (supported: sysbench, geekbench, winsat)")
flag.StringVar(&cpuTestThread, "cput", "", "Specify CPU test thread count (supported: 1, 2, ...)")
flag.StringVar(&memoryTestMethod, "memorym", "", "Specify Memory test method (supported: sysbench, dd, winsat)")
flag.StringVar(&diskTestMethod, "diskm", "", "Specify Disk test method (supported: sysbench, dd, winsat)")
flag.StringVar(&diskTestPath, "diskp", "", "Specify Disk test path, example: -diskp /root")
flag.BoolVar(&diskMultiCheck, "diskmc", false, "Enable multiple disk checks, example: -diskmc=false")
flag.Parse()
if showVersion {
fmt.Println(ecsVersion)
return
}
if language == "zh" {
printCenteredTitle("融合怪测试", width)
fmt.Printf("版本：%s\n", ecsVersion)
fmt.Println("测评频道: https://t.me/vps_reviews\nGo项目地址：https://github.com/oneclickvirt/ecs\nShell项目地址：https://github.com/spiritLHLS/ecs")
printCenteredTitle("基础信息", width)
basic.Basic(language)
printCenteredTitle(fmt.Sprintf("CPU测试-通过%s测试", cpuTestMethod), width)
cputest.CpuTest(language, cpuTestMethod, cpuTestThread)
printCenteredTitle(fmt.Sprintf("内存测试-通过%s测试", cpuTestMethod), width)
memorytest.MemoryTest(language, memoryTestMethod)
printCenteredTitle(fmt.Sprintf("硬盘测试-通过%s测试", diskTestMethod), width)
disktest.DiskTest(language, diskTestMethod, diskTestPath, diskMultiCheck)
printCenteredTitle("", width)
}
}

7
main_test.go Normal file
View File

@@ -0,0 +1,7 @@
package main
import "testing"
func Test(t *testing.T) {
main()
}

18
memorytest/memorytest.go
View File

@@ -6,24 +6,26 @@ import (
"runtime"
)
func memorytest() {
func MemoryTest(language, testMethod string) {
var res string
language := "zh"
testMethod := ""
if runtime.GOOS == "windows" {
res = memory.WinsatTest(language)
if testMethod != "winsat" && testMethod != "" {
res = "Detected host is Windows, using Winsat for testing.\n"
}
res += memory.WinsatTest(language)
} else {
if testMethod == "sysbench" {
switch testMethod {
case "sysbench":
res = memory.SysBenchTest(language)
if res == "" {
res = "sysbench test failed, switch to use dd test.\n"
res += memory.DDTest(language)
}
} else if testMethod == "dd" {
case "dd":
res = memory.DDTest(language)
default:
res = "Unsupported test method"
}
}
fmt.Println("--------------------------------------------------")
fmt.Printf(res)
fmt.Println("--------------------------------------------------")
}

2
memorytest/memorytest_test.go
View File

@@ -5,5 +5,5 @@ import (
)
func Test(t *testing.T) {
memorytest()
MemoryTest("zh", "sysbench")
}