big refactor

agent/agent.go

@@ -213,111 +213,8 @@ func (a *Agent) SyncMeshNodeID() {
 	}
 }
 
-func (a *Agent) setupNatsOptions() []nats.Option {
-	opts := make([]nats.Option, 0)
-	opts = append(opts, nats.Name("TacticalRMM"))
-	opts = append(opts, nats.UserInfo(a.AgentID, a.Token))
-	opts = append(opts, nats.ReconnectWait(time.Second*5))
-	opts = append(opts, nats.RetryOnFailedConnect(true))
-	opts = append(opts, nats.MaxReconnects(-1))
-	opts = append(opts, nats.ReconnectBufSize(-1))
-	return opts
-}
 
-func (a *Agent) GetUninstallExe() string {
-	cderr := os.Chdir(a.ProgramDir)
-	if cderr == nil {
-		files, err := filepath.Glob("unins*.exe")
-		if err == nil {
-			for _, f := range files {
-				if strings.Contains(f, "001") {
-					return f
-				}
-			}
-		}
-	}
-	return "unins000.exe"
-}
 
-func (a *Agent) CleanupAgentUpdates() {
-	cderr := os.Chdir(a.ProgramDir)
-	if cderr != nil {
-		a.Logger.Errorln(cderr)
-		return
-	}
-
-	files, err := filepath.Glob("winagent-v*.exe")
-	if err == nil {
-		for _, f := range files {
-			os.Remove(f)
-		}
-	}
-
-	cderr = os.Chdir(os.Getenv("TMP"))
-	if cderr != nil {
-		a.Logger.Errorln(cderr)
-		return
-	}
-	folders, err := filepath.Glob("tacticalrmm*")
-	if err == nil {
-		for _, f := range folders {
-			os.RemoveAll(f)
-		}
-	}
-}
-
-func (a *Agent) RunPythonCode(code string, timeout int, args []string) (string, error) {
-	content := []byte(code)
-	dir, err := ioutil.TempDir("", "tacticalpy")
-	if err != nil {
-		a.Logger.Debugln(err)
-		return "", err
-	}
-	defer os.RemoveAll(dir)
-
-	tmpfn, _ := ioutil.TempFile(dir, "*.py")
-	if _, err := tmpfn.Write(content); err != nil {
-		a.Logger.Debugln(err)
-		return "", err
-	}
-	if err := tmpfn.Close(); err != nil {
-		a.Logger.Debugln(err)
-		return "", err
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(timeout)*time.Second)
-	defer cancel()
-
-	var outb, errb bytes.Buffer
-	cmdArgs := []string{tmpfn.Name()}
-	if len(args) > 0 {
-		cmdArgs = append(cmdArgs, args...)
-	}
-	a.Logger.Debugln(cmdArgs)
-	cmd := exec.CommandContext(ctx, a.PyBin, cmdArgs...)
-	cmd.Stdout = &outb
-	cmd.Stderr = &errb
-
-	cmdErr := cmd.Run()
-
-	if ctx.Err() == context.DeadlineExceeded {
-		a.Logger.Debugln("RunPythonCode:", ctx.Err())
-		return "", ctx.Err()
-	}
-
-	if cmdErr != nil {
-		a.Logger.Debugln("RunPythonCode:", cmdErr)
-		return "", cmdErr
-	}
-
-	if errb.String() != "" {
-		a.Logger.Debugln(errb.String())
-		return errb.String(), errors.New("RunPythonCode stderr")
-	}
-
-	return outb.String(), nil
-
-}
 
 func (a *Agent) CreateTRMMTempDir() {
 	// create the temp dir for running scripts