commit

aarch64/kinglong/common/config/c_cloud.go

@@ -44,6 +44,7 @@ type cloudConfig struct {
 	TriggersDir           string    `yaml:"triggers-dir"`
 	TcpPort               string    `yaml:"tcp-port"`
 	RpcPort               string    `yaml:"rpc-port"`
+	RecordEnvs            []string  `yaml:"record-envs"`
 	Triggers              []trigger `yaml:"triggers"`
 	Hosts                 []host    `yaml:"hosts"`
 	Ros                   ros       `yaml:"ros"`

aarch64/kinglong/common/config/yaml/cloud-config-v2253.yaml

@@ -16,6 +16,8 @@ triggers-dir: /mnt/media/sda1/rosbag-handle/triggers/
 time-window-send-gap: 6
 tcp-port: 12340
 rpc-port: 12341
+record-envs:
+  - ""
 ros:
   master-address: 192.168.1.102:11311
   nodes:

aarch64/kinglong/common/config/yaml/cloud-config-v2304.yaml

@@ -16,6 +16,8 @@ triggers-dir: /mnt/media/sda1/rosbag-handle/triggers/
 time-window-send-gap: 6
 tcp-port: 12340
 rpc-port: 12341
+record-envs:
+  - ""
 ros:
   master-address: 192.168.1.102:11311
   nodes:

aarch64/kinglong/common/service/disk_clean.go

@@ -33,7 +33,7 @@ func DiskClean() {
 		diskUsed, _ := util.GetDiskUsed(commonConfig.CloudConfig.Disk.Name)
 		if diskUsed > commonConfig.CloudConfig.Disk.Used {
 			policy := commonConfig.PlatformConfig.TaskCachePolicy
-			c_log.GlobalLogger.Errorf("磁盘占用超过 %v，触发删除规则 %v", commonConfig.CloudConfig.Disk.Used, policyToDescription[policy])
+			c_log.GlobalLogger.Errorf("磁盘占用 %v 超过 %v，触发删除规则 %v", diskUsed, commonConfig.CloudConfig.Disk.Used, policyToDescription[policy])
 			if policy == "TTL" {
 				// 1 获取时间窗口队列中的第二个
 				if len(entity.TimeWindowConsumerQueue) > 2 {

aarch64/pji/common/config/yaml/cloud-config-pji1.yaml

@@ -17,7 +17,6 @@ rpc-port: 12341
 record-envs:
   - "LESSOPEN=| /usr/bin/lesspipe %s"
   - "C_INCLUDE_PATH=/usr/include/drm:"
-  - "MAIL=/var/mail/root"
   - "USER=root"
   - "SSH_CLIENT=10.1.136.99 54061 22"
   - "ROS_PACKAGE_PATH=/opt/ros/melodic/share"
@@ -38,7 +37,6 @@ record-envs:
   - "PKG_CONFIG_PATH=/opt/ros/melodic/lib/pkgconfig"
   - "XDG_SESSION_ID=5"
   - "GST_GL_API=gles2"
-  - "TERM=xterm-256color"
   - "PATH=/opt/ros/melodic/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/usr/local/go/bin:/root/go/bin"
   - "XDG_RUNTIME_DIR=/run/user/0"
   - "GST_GL_PLATFORM=egl"
@@ -50,7 +48,6 @@ record-envs:
   - "ROS_MASTER_URI=http://192.168.1.104:11311"
   - "LESSCLOSE=/usr/bin/lesspipe %s %s"
   - "PWD=/root/rosbag-handle"
-  - "SSH_CONNECTION=10.1.136.99 54061 192.168.1.104 22"
   - "PYTHONPATH=/opt/ros/melodic/lib/python2.7/dist-packages"
   - "ROS_HOSTNAME=192.168.1.104"
   - "CMAKE_PREFIX_PATH=/opt/ros/melodic"

aarch64/pji/common/service/rosbag_record.go

@@ -46,8 +46,7 @@ func BagRecord(nodeName string) {
 		c_log.GlobalLogger.Info("系统环境变量为：", systemEnv)
 	parent:
 		for {
-			//allEnv := append(systemEnv, recordEnv...)
-			c_log.GlobalLogger.Info("record环境变量为：", config.CloudConfig.RecordEnvs)
+			c_log.GlobalLogger.Info("record 环境变量为：", config.CloudConfig.RecordEnvs)
 			cmd, err = util.ExecuteWithEnvAndDirAsync(config.CloudConfig.RecordEnvs, config.CloudConfig.BagDataDir, "/opt/ros/melodic/bin/rosbag", command...)
 			if err != nil {
 				c_log.GlobalLogger.Error("执行record命令", command, "出错：", err)

aarch64/pjisuv/common/service/disk_clean.go

@@ -33,7 +33,7 @@ func DiskClean() {
 		diskUsed, _ := util.GetDiskUsed(commonConfig.CloudConfig.Disk.Name)
 		if diskUsed > commonConfig.CloudConfig.Disk.Used {
 			policy := commonConfig.PlatformConfig.TaskCachePolicy
-			c_log.GlobalLogger.Errorf("磁盘占用超过 %v，触发删除规则 %v", commonConfig.CloudConfig.Disk.Used, policyToDescription[policy])
+			c_log.GlobalLogger.Errorf("磁盘占用 %v 超过 %v，触发删除规则 %v", diskUsed, commonConfig.CloudConfig.Disk.Used, policyToDescription[policy])
 			if policy == "TTL" {
 				// 1 获取时间窗口队列中的第二个
 				if len(entity.TimeWindowConsumerQueue) > 2 {