mirror of https://github.com/ouqiang/gocron
去掉windows平台限制
parent
a336e50366
commit
283d207043
|
@ -7,6 +7,14 @@ import (
|
||||||
"github.com/ouqiang/cron-scheduler/modules/utils"
|
"github.com/ouqiang/cron-scheduler/modules/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// ansible是否有安装
|
||||||
|
func IsInstalled() bool {
|
||||||
|
_, err := utils.ExecShell("ansible", "--version")
|
||||||
|
|
||||||
|
|
||||||
|
return err == nil
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 执行ad-hoc
|
* 执行ad-hoc
|
||||||
* hosts 主机名或主机别名 逗号分隔
|
* hosts 主机名或主机别名 逗号分隔
|
||||||
|
|
|
@ -7,7 +7,6 @@ import (
|
||||||
"github.com/ouqiang/cron-scheduler/models"
|
"github.com/ouqiang/cron-scheduler/models"
|
||||||
"github.com/ouqiang/cron-scheduler/modules/ansible"
|
"github.com/ouqiang/cron-scheduler/modules/ansible"
|
||||||
"github.com/ouqiang/cron-scheduler/modules/crontask"
|
"github.com/ouqiang/cron-scheduler/modules/crontask"
|
||||||
"github.com/ouqiang/cron-scheduler/modules/utils"
|
|
||||||
"github.com/ouqiang/cron-scheduler/service"
|
"github.com/ouqiang/cron-scheduler/service"
|
||||||
"github.com/ouqiang/cron-scheduler/modules/setting"
|
"github.com/ouqiang/cron-scheduler/modules/setting"
|
||||||
"github.com/ouqiang/cron-scheduler/modules/logger"
|
"github.com/ouqiang/cron-scheduler/modules/logger"
|
||||||
|
@ -21,11 +20,11 @@ var (
|
||||||
AppConfig string // 应用配置文件
|
AppConfig string // 应用配置文件
|
||||||
AnsibleHosts string // ansible hosts文件
|
AnsibleHosts string // ansible hosts文件
|
||||||
Installed bool // 应用是否安装过
|
Installed bool // 应用是否安装过
|
||||||
|
IsWindows bool // 是否是在windows上运行
|
||||||
)
|
)
|
||||||
|
|
||||||
func InitEnv() {
|
func InitEnv() {
|
||||||
logger.InitLogger()
|
logger.InitLogger()
|
||||||
CheckEnv()
|
|
||||||
wd, err := os.Getwd()
|
wd, err := os.Getwd()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Fatal(err)
|
logger.Fatal(err)
|
||||||
|
@ -36,6 +35,7 @@ func InitEnv() {
|
||||||
DataDir = AppDir + "/data"
|
DataDir = AppDir + "/data"
|
||||||
AppConfig = ConfDir + "/app.ini"
|
AppConfig = ConfDir + "/app.ini"
|
||||||
AnsibleHosts = ConfDir + "/ansible_hosts.ini"
|
AnsibleHosts = ConfDir + "/ansible_hosts.ini"
|
||||||
|
IsWindows = runtime.GOOS == "windows"
|
||||||
checkDirExists(ConfDir, LogDir, DataDir)
|
checkDirExists(ConfDir, LogDir, DataDir)
|
||||||
// ansible配置文件目录
|
// ansible配置文件目录
|
||||||
os.Setenv("ANSIBLE_CONFIG", ConfDir)
|
os.Setenv("ANSIBLE_CONFIG", ConfDir)
|
||||||
|
@ -56,18 +56,6 @@ func IsInstalled() bool {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
// 检测环境
|
|
||||||
func CheckEnv() {
|
|
||||||
// ansible不支持安装在windows上, windows只能作为被控机
|
|
||||||
if runtime.GOOS == "windows" {
|
|
||||||
logger.Fatal("不支持在windows上运行")
|
|
||||||
}
|
|
||||||
_, err := utils.ExecShell("ansible", "--version")
|
|
||||||
if err != nil {
|
|
||||||
logger.Fatal(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 创建安装锁文件
|
// 创建安装锁文件
|
||||||
func CreateInstallLock() error {
|
func CreateInstallLock() error {
|
||||||
_, err := os.Create(ConfDir + "/install.lock")
|
_, err := os.Create(ConfDir + "/install.lock")
|
||||||
|
|
Loading…
Reference in New Issue