Compare commits
6 Commits
c47bd6ebb7
...
7b3ba74b25
Author | SHA1 | Date |
---|---|---|
Malachi Soord | 7b3ba74b25 | |
Paulo Truta | 6ccd4a3299 | |
Paulo Truta | 42b1a34ca7 | |
Paulo Truta | 4bb343769f | |
Paulo Truta | 3bb6200b1c | |
Malachi Soord | f0bfc92295 |
|
@ -22,7 +22,7 @@ jobs:
|
||||||
run: make build
|
run: make build
|
||||||
- name: Test
|
- name: Test
|
||||||
run: make test-with-coverage
|
run: make test-with-coverage
|
||||||
# - uses: codecov/codecov-action@v1
|
- uses: codecov/codecov-action@v1
|
||||||
# with:
|
with:
|
||||||
# token: ${{ secrets.CODECOV_TOKEN }}
|
token: ${{ secrets.CODECOV_TOKEN }}
|
||||||
# files: coverage.out
|
files: coverage.out
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
codecov:
|
|
||||||
require_ci_to_pass: no
|
|
||||||
|
|
||||||
comment: false
|
comment: false
|
||||||
|
github_checks:
|
||||||
|
annotations: false
|
||||||
|
|
|
@ -416,12 +416,24 @@ func GetEdgeAppServices(ID string) []EdgeAppService {
|
||||||
var edgeAppServices []EdgeAppService
|
var edgeAppServices []EdgeAppService
|
||||||
|
|
||||||
for _, serviceID := range serviceSlices {
|
for _, serviceID := range serviceSlices {
|
||||||
|
shouldBeRunning := false
|
||||||
|
isRunning := false
|
||||||
|
|
||||||
|
// Is service "runnable" when .run lockfile in the app folder
|
||||||
|
_, err := os.Stat(utils.GetPath(utils.EdgeAppsPath) + ID + runnableFilename)
|
||||||
|
if !os.IsNotExist(err) {
|
||||||
|
shouldBeRunning = true
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if the service is actually running
|
||||||
|
if shouldBeRunning {
|
||||||
cmdArgs = []string{"-f", wsPath + "/docker-compose.yml", "exec", "-T", serviceID, "echo", "'Service Check'"}
|
cmdArgs = []string{"-f", wsPath + "/docker-compose.yml", "exec", "-T", serviceID, "echo", "'Service Check'"}
|
||||||
cmdResult := utils.Exec(wsPath, "docker-compose", cmdArgs)
|
cmdResult := utils.Exec(wsPath, "docker-compose", cmdArgs)
|
||||||
isRunning := false
|
|
||||||
if cmdResult != "" {
|
if cmdResult != "" {
|
||||||
isRunning = true
|
isRunning = true
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
edgeAppServices = append(edgeAppServices, EdgeAppService{ID: serviceID, IsRunning: isRunning})
|
edgeAppServices = append(edgeAppServices, EdgeAppService{ID: serviceID, IsRunning: isRunning})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,7 @@ package storage
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"strconv"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
|
@ -73,12 +74,13 @@ const (
|
||||||
DISK_TYPE_SDA DeviceIdentifier = "sda"
|
DISK_TYPE_SDA DeviceIdentifier = "sda"
|
||||||
DISK_TYPE_MCBLK DeviceIdentifier = "mmcblk0"
|
DISK_TYPE_MCBLK DeviceIdentifier = "mmcblk0"
|
||||||
DISK_TYPE_VDA DeviceIdentifier = "vda"
|
DISK_TYPE_VDA DeviceIdentifier = "vda"
|
||||||
|
MIN_DISK_SIZE int = 1048576 // 1GB in bytes
|
||||||
)
|
)
|
||||||
|
|
||||||
func GetDeviceIdentifier(release_version diagnostics.ReleaseVersion) DeviceIdentifier {
|
func GetDeviceIdentifier(release_version diagnostics.ReleaseVersion) DeviceIdentifier {
|
||||||
switch release_version {
|
switch release_version {
|
||||||
case diagnostics.CLOUD_VERSION:
|
case diagnostics.CLOUD_VERSION:
|
||||||
return DISK_TYPE_VDA
|
return DISK_TYPE_SDA
|
||||||
case diagnostics.PROD_VERSION:
|
case diagnostics.PROD_VERSION:
|
||||||
return DISK_TYPE_MCBLK
|
return DISK_TYPE_MCBLK
|
||||||
}
|
}
|
||||||
|
@ -134,7 +136,13 @@ func GetDevices(release_version diagnostics.ReleaseVersion) []Device {
|
||||||
currentDevice.InUse = currentDeviceInUseFlag
|
currentDevice.InUse = currentDeviceInUseFlag
|
||||||
currentDeviceInUseFlag = false
|
currentDeviceInUseFlag = false
|
||||||
currentPartitions = []Partition{}
|
currentPartitions = []Partition{}
|
||||||
|
size, err := strconv.Atoi(currentDevice.Size)
|
||||||
|
if err != nil {
|
||||||
|
size = 0
|
||||||
|
}
|
||||||
|
if size > MIN_DISK_SIZE {
|
||||||
devices = append(devices, currentDevice)
|
devices = append(devices, currentDevice)
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
firstDevice = false
|
firstDevice = false
|
||||||
}
|
}
|
||||||
|
@ -193,8 +201,22 @@ func GetDevices(release_version diagnostics.ReleaseVersion) []Device {
|
||||||
currentDevice.Status.Description = "Not configured"
|
currentDevice.Status.Description = "Not configured"
|
||||||
}
|
}
|
||||||
currentDevice.InUse = currentDeviceInUseFlag
|
currentDevice.InUse = currentDeviceInUseFlag
|
||||||
devices = append([]Device{currentDevice}, devices...) // Prepending the first device...
|
|
||||||
|
|
||||||
|
fmt.Println("Secondary Storage Devices Found: ", len(devices))
|
||||||
|
fmt.Println("Main Storage Device size: ", currentDevice.Size)
|
||||||
|
|
||||||
|
// only append device if size > 1GB
|
||||||
|
if currentDevice.Size != "" && currentDevice.Size != "0" {
|
||||||
|
// Convert size to int
|
||||||
|
// Convert string to int
|
||||||
|
size, err := strconv.Atoi(currentDevice.Size)
|
||||||
|
if err != nil {
|
||||||
|
size = 0
|
||||||
|
}
|
||||||
|
if size > MIN_DISK_SIZE {
|
||||||
|
devices = append([]Device{currentDevice}, devices...) // Prepending the first device...
|
||||||
|
}
|
||||||
|
}
|
||||||
devices = getDevicesSpaceUsage(devices)
|
devices = getDevicesSpaceUsage(devices)
|
||||||
|
|
||||||
return devices
|
return devices
|
||||||
|
|
|
@ -100,6 +100,10 @@ type taskSetupBackupsArgs struct {
|
||||||
RepositoryPassword string `json:"repository_password"`
|
RepositoryPassword string `json:"repository_password"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type taskStartShellArgs struct {
|
||||||
|
Timeout int `json:"timeout"`
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
const STATUS_CREATED int = 0
|
const STATUS_CREATED int = 0
|
||||||
const STATUS_EXECUTING int = 1
|
const STATUS_EXECUTING int = 1
|
||||||
|
@ -240,6 +244,22 @@ func ExecuteTask(task Task) Task {
|
||||||
taskResult := taskDisableTunnel()
|
taskResult := taskDisableTunnel()
|
||||||
task.Result = sql.NullString{String: taskResult, Valid: true}
|
task.Result = sql.NullString{String: taskResult, Valid: true}
|
||||||
|
|
||||||
|
case "start_shell":
|
||||||
|
log.Println("Starting SSHX.io Shell")
|
||||||
|
var args taskStartShellArgs
|
||||||
|
err := json.Unmarshal([]byte(task.Args.String), &args)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("Error reading arguments or start_shell task: %s", err)
|
||||||
|
} else {
|
||||||
|
taskResult := taskStartShell(args)
|
||||||
|
task.Result = sql.NullString{String: taskResult, Valid: true}
|
||||||
|
}
|
||||||
|
|
||||||
|
case "stop_shell":
|
||||||
|
log.Println("Stopping SSHX.io Shell...")
|
||||||
|
taskResult := taskStopShell()
|
||||||
|
task.Result = sql.NullString{String: taskResult, Valid: true}
|
||||||
|
|
||||||
case "install_edgeapp":
|
case "install_edgeapp":
|
||||||
|
|
||||||
log.Println("Installing EdgeApp...")
|
log.Println("Installing EdgeApp...")
|
||||||
|
@ -931,6 +951,78 @@ func taskDisableTunnel() string {
|
||||||
return "{\"status\": \"ok\"}"
|
return "{\"status\": \"ok\"}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func taskStartShell(args taskStartShellArgs) string {
|
||||||
|
fmt.Println("Executing taskStartShell")
|
||||||
|
wsPath := utils.GetPath(utils.WsPath)
|
||||||
|
|
||||||
|
// kill the process if its running
|
||||||
|
utils.Exec(wsPath, "killall", []string{"sshx"})
|
||||||
|
|
||||||
|
cmd := exec.Command("/usr/local/bin/sshx", "--quiet", "--shell", "bash")
|
||||||
|
stdout, err := cmd.StdoutPipe()
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
scanner := bufio.NewScanner(stdout)
|
||||||
|
err = cmd.Start()
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
url := ""
|
||||||
|
|
||||||
|
timeout := args.Timeout
|
||||||
|
|
||||||
|
for scanner.Scan() {
|
||||||
|
fmt.Println(scanner.Text())
|
||||||
|
text := scanner.Text()
|
||||||
|
if strings.Contains(text, "https://") {
|
||||||
|
url = text
|
||||||
|
fmt.Println("Shell start is responding with URL: " + url)
|
||||||
|
utils.WriteOption("SHELL_URL", url)
|
||||||
|
utils.WriteOption("SHELL_STATUS", "running")
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if scanner.Err() != nil {
|
||||||
|
cmd.Process.Kill()
|
||||||
|
cmd.Wait()
|
||||||
|
panic(scanner.Err())
|
||||||
|
}
|
||||||
|
|
||||||
|
go func() {
|
||||||
|
fmt.Println("Running shell async")
|
||||||
|
|
||||||
|
// cmd.Wait()
|
||||||
|
|
||||||
|
// Keep retrying to calculate timeout to know when to kill the process
|
||||||
|
for {
|
||||||
|
timeout = timeout - 1
|
||||||
|
if timeout <= 0 {
|
||||||
|
fmt.Println("Timeout reached, killing process...")
|
||||||
|
utils.Exec(wsPath, "killall sshx", []string{})
|
||||||
|
utils.WriteOption("SHELL_STATUS", "not_running")
|
||||||
|
break
|
||||||
|
}
|
||||||
|
fmt.Println("Active Shell Timeout is " + fmt.Sprint(timeout) + " seconds")
|
||||||
|
time.Sleep(1 * time.Second)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
return "{\"status\": \"ok\"}"
|
||||||
|
}
|
||||||
|
|
||||||
|
func taskStopShell() string {
|
||||||
|
fmt.Println("Executing taskStopShell")
|
||||||
|
wsPath := utils.GetPath(utils.WsPath)
|
||||||
|
|
||||||
|
// kill the process if its running
|
||||||
|
utils.Exec(wsPath, "killall", []string{"sshx"})
|
||||||
|
utils.WriteOption("SHELL_STATUS", "not_running")
|
||||||
|
|
||||||
|
return "{\"status\": \"ok\"}"
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
func taskInstallEdgeApp(args taskInstallEdgeAppArgs) string {
|
func taskInstallEdgeApp(args taskInstallEdgeAppArgs) string {
|
||||||
fmt.Println("Executing taskInstallEdgeApp for " + args.ID)
|
fmt.Println("Executing taskInstallEdgeApp for " + args.ID)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue