Skip to content

Дмитрий Корытько / hware

Go to a project
Toggle navigation
Toggle navigation pinning
Commit a8010af3 a8010af34e3a49241b9bfcf176181552e92754c7 by root
Options

save

1 parent da398cc6
Inline Side-by-side
Showing 65 changed files with 221 additions and 140 deletions
15eb35b145401b3c6a2a69578cc0c148
\ No newline at end of file
20aa5ff62216b4538dc1681fb4439906b5315caf
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.emercit</groupId>
<artifactId>utilstools</artifactId>
<version>1.23</version>
</project>
6bc97a3eda1381d115a4553b89a66920
\ No newline at end of file
5bbfebfb25a691b0f97cc34c3927618b7713e04d
\ No newline at end of file
c5607a59cfc8f1e8289ee97a7891e0f7
\ No newline at end of file
5e835ccc9394f0564e0b529f82b13622620e5a85
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.emercit</groupId>
<artifactId>utilstools</artifactId>
<version>1.24</version>
</project>
5a580b2b577cea96f8de5cd5a4dea7a4
\ No newline at end of file
87db22fa91cc7b9805e21f46f852a94dcbc569ec
\ No newline at end of file
......@@ -3,7 +3,7 @@
<groupId>org.emercit</groupId>
<artifactId>utilstools</artifactId>
<versioning>
<release>1.22</release>
<release>1.24</release>
<versions>
<version>1.0</version>
<version>1.1</version>
......@@ -28,7 +28,9 @@
<version>1.20</version>
<version>1.21</version>
<version>1.22</version>
<version>1.23</version>
<version>1.24</version>
</versions>
<lastUpdated>20150804090803</lastUpdated>
<lastUpdated>20150805070834</lastUpdated>
</versioning>
</metadata>
......
d3cc127db852d356f6369653233badc8
\ No newline at end of file
8ecd5372e5a1b5ec31440b910a62d00f
\ No newline at end of file
......
3a98161da9ae3de4390b837d2853af35cd5c60c2
\ No newline at end of file
53d2aab96a91cb154e320a7c71d864f062408ca0
\ No newline at end of file
......
......@@ -90,7 +90,8 @@ Ext.define('App.view.Sv', {
text : 'Автозагрузка',
dataIndex : 'autostart',
width : 100,
xtype: 'checkcolumn'
xtype: 'checkcolumn',
hidden:true
},
{
......
......@@ -10,8 +10,8 @@
</layout>
</appender>
<!-- LOG FILE -->
<appender name="file" class="org.apache.log4j.FileAppender">
<param name="File" value="/var/log/devtools.log" />
<param name="MaxFileSize" value="10KB"/>
<layout class="org.apache.log4j.PatternLayout">
......@@ -25,14 +25,14 @@
<level value="info" />
<appender-ref ref="console" />
<appender-ref ref="file" />
<!--<appender-ref ref="file" />-->
</logger>
<logger name="org.emercit">
<level value="info" />
<appender-ref ref="console" />
<appender-ref ref="file" />
<!-- <appender-ref ref="file" />-->
</logger>
......@@ -40,25 +40,25 @@
<logger name="org.springframework.core">
<level value="info" />
<appender-ref ref="console" />
<appender-ref ref="file" />
<!-- <appender-ref ref="file" /> -->
</logger>
<logger name="org.springframework.beans">
<level value="info" />
<appender-ref ref="console" />
<appender-ref ref="file" />
<!-- <appender-ref ref="file" /> -->
</logger>
<logger name="org.springframework.context">
<level value="info" />
<appender-ref ref="console" />
<appender-ref ref="file" />
<!--<appender-ref ref="file" />-->
</logger>
<logger name="org.springframework.web">
<level value="info" />
<appender-ref ref="console" />
<appender-ref ref="file" />
<!-- <appender-ref ref="file" /> -->
</logger>
<!-- Root Logger -->
......
......@@ -2,7 +2,7 @@ package org.emercit.utilstools.config;
import java.util.Vector;
import org.emercit.proxymanager.model.ProxyBean;
import org.emercit.utilstools.proxymanager.model.ProxyBean;
public class DefSettings {
......@@ -83,4 +83,9 @@ public class DefSettings {
public static final String devtools_title="Web интерфейс для конфигурации";
public static final String ssh_host="127.0.0.1";
public static final int ssh_port=22;
public static final String ssh_login="root";
public static final String ssh_password="root";
}
......
......@@ -43,7 +43,19 @@ public enum Msg {
RestartEthSucc(22,TypeMsg.INFO,"Перезагрузка сетевого интерфейса успешно выполнена"),
RestartEthErr(23,TypeMsg.ERROR,"Перезагрузка сетевого интерфейса не выполнена");
RestartEthErr(23,TypeMsg.ERROR,"Перезагрузка сетевого интерфейса не выполнена"),
DnsUpdateSucc(24,TypeMsg.INFO,"Конфигурация DNS выполнена успешно"),
DnsUpdateError(25,TypeMsg.ERROR,"Конфигурация DNS не выполнена"),
NTPUpdateSucc(26,TypeMsg.INFO,"Конфигурация NTP выполнена успешно"),
NTPUpdateError(27,TypeMsg.ERROR,"Конфигурация NTP не выполнена"),
ProxyUpdateSucc(28,TypeMsg.INFO,"Конфигурация Proxy выполнена успешно"),
ProxyUpdateError(29,TypeMsg.ERROR,"Конфигурация Proxy не выполнена");
private int code;
......
package org.emercit.controldevtools.bean;
package org.emercit.utilstools.controldevtools.bean;
import java.awt.Color;
import java.awt.Dimension;
......@@ -31,15 +31,11 @@ import javax.swing.event.SwingPropertyChangeSupport;
import org.apache.log4j.Logger;
import org.emercit.utilstools.config.DefSettings;
import org.emercit.pckutils.checkservice.STService;
import org.emercit.utilstools.pckutils.checkservice.STService;
import org.emercit.utilstools.service.Settings;
import org.emercit.svmanager.service.SvControl;
import org.emercit.svmanager.service.Sv;
import org.emercit.svmanager.model.SvBean;
import org.emercit.utilstools.svmanager.model.SvBean;
import org.emercit.utilstools.svmanager.service.Sv;
import org.emercit.utilstools.svmanager.service.SvControl;
public class DevToolsBean extends RoundPanel implements Externalizable {
......@@ -225,7 +221,7 @@ public class DevToolsBean extends RoundPanel implements Externalizable {
block=true;
svcontrol.start();
svcontrol.stop();
block=false;
......
package org.emercit.controldevtools.bean;
package org.emercit.utilstools.controldevtools.bean;
import java.awt.BasicStroke;
......
......@@ -5,4 +5,4 @@
* @author root
*
*/
package org.emercit.controldevtools.bean;
\ No newline at end of file
package org.emercit.utilstools.controldevtools.bean;
\ No newline at end of file
......
package org.emercit.devinfo.service;
package org.emercit.utilstools.devinfo.service;
import java.beans.XMLDecoder;
import java.beans.XMLEncoder;
......@@ -8,10 +8,10 @@ import java.io.FileInputStream;
import java.io.FileOutputStream;
import org.apache.log4j.Logger;
import org.emercit.devinfo.model.DevInfoBean;
import org.emercit.utilstools.config.DefSettings;
import org.emercit.utilstools.config.Msg;
import org.emercit.utilstools.config.Paths;
import org.emercit.utilstools.devinfo.model.DevInfoBean;
import org.emercit.xmldbmanager.service.Db;
public class DevInfo implements IDevInfo {
......
package org.emercit.devinfo.service;
package org.emercit.utilstools.devinfo.service;
import java.beans.XMLDecoder;
import java.beans.XMLEncoder;
......@@ -8,7 +8,7 @@ import java.io.FileInputStream;
import java.io.FileOutputStream;
import org.emercit.utilstools.config.Msg;
import org.emercit.devinfo.model.DevInfoBean;
import org.emercit.utilstools.devinfo.model.DevInfoBean;
public interface IDevInfo {
......
package org.emercit.displaycalibrator.service;
package org.emercit.utilstools.displaycalibrator.service;
import org.emercit.utilstools.config.Msg;
......
package org.emercit.displaycalibrator.service;
package org.emercit.utilstools.displaycalibrator.service;
import java.io.BufferedReader;
import java.io.BufferedWriter;
......@@ -8,9 +8,9 @@ import java.io.InputStreamReader;
import java.util.Vector;
import org.apache.log4j.Logger;
import org.emercit.devinfo.service.DevInfo;
import org.emercit.pckutils.cmd.CmdExec;
import org.emercit.utilstools.config.Msg;
import org.emercit.utilstools.devinfo.service.DevInfo;
import org.emercit.utilstools.pckutils.cmd.CmdExec;
public class DCalibratorBB implements DCalibrator {
......
package org.emercit.dnsmanager.model;
package org.emercit.utilstools.dnsmanager.model;
import java.io.Serializable;
......
package org.emercit.dnsmanager.service;
package org.emercit.utilstools.dnsmanager.service;
import java.io.BufferedWriter;
import java.io.File;
......@@ -7,10 +7,10 @@ import java.io.IOException;
import java.util.Vector;
import org.apache.log4j.Logger;
import org.emercit.dnsmanager.model.DnsBean;
import org.emercit.pckutils.cmd.CmdExec;
import org.emercit.utilstools.config.DefSettings;
import org.emercit.utilstools.config.Msg;
import org.emercit.utilstools.dnsmanager.model.DnsBean;
import org.emercit.utilstools.pckutils.cmd.CmdExec;
public class DnsLinux implements IDns{
......@@ -98,12 +98,13 @@ public class DnsLinux implements IDns{
}
bw.close();
//log.info(Msg.SaveFileSucc.getDescription());
return Msg.SaveFileSucc.getCode();
log.info(Msg.DnsUpdateSucc.getDescription());
return Msg.DnsUpdateSucc.getCode();
} catch (IOException e) {
log.error(e.getMessage());
return Msg.SaveFileError.getCode();
log.error(Msg.DnsUpdateError.getDescription());
return Msg.DnsUpdateError.getCode();
}
}
......
package org.emercit.dnsmanager.service;
package org.emercit.utilstools.dnsmanager.service;
import org.emercit.dnsmanager.model.DnsBean;
import org.emercit.utilstools.dnsmanager.model.DnsBean;
import java.util.Vector;
......
package org.emercit.dtmanager.model;
package org.emercit.utilstools.dtmanager.model;
import java.io.Serializable;
......
package org.emercit.dtmanager.model;
package org.emercit.utilstools.dtmanager.model;
import java.io.Serializable;
......
package org.emercit.dtmanager.service;
package org.emercit.utilstools.dtmanager.service;
public interface INtp {
......
package org.emercit.dtmanager.service;
package org.emercit.utilstools.dtmanager.service;
import java.io.BufferedWriter;
import java.io.File;
......@@ -6,9 +6,9 @@ import java.io.FileWriter;
import java.io.IOException;
import org.apache.log4j.Logger;
import org.emercit.pckutils.cmd.CmdExec;
import org.emercit.utilstools.config.Msg;
import org.emercit.utilstools.config.DefSettings;
import org.emercit.utilstools.pckutils.cmd.CmdExec;
public class NtpLinux implements INtp {
......@@ -62,12 +62,13 @@ public class NtpLinux implements INtp {
bw.close();
//log.info(Msg.SaveFileSucc.getDescription());
log.info(Msg.NTPUpdateSucc.getDescription());
} catch (IOException e) {
log.error(e.getMessage());
return Msg.SaveFileError.getCode();
log.error(Msg.NTPUpdateError.getDescription());
return Msg.NTPUpdateError.getCode();
}
return Msg.SaveFileSucc.getCode();
return Msg.NTPUpdateSucc.getCode();
}
public int init() {
......
package org.emercit.ethmanager.model;
package org.emercit.utilstools.ethmanager.model;
import java.io.Serializable;
......
package org.emercit.ethmanager.service;
package org.emercit.utilstools.ethmanager.service;
import org.apache.log4j.Logger;
import org.emercit.ethmanager.model.EthBean;
import java.util.Vector;
import java.io.File;
import java.io.FileWriter;
import java.io.BufferedWriter;
import java.io.IOException;
import org.emercit.utilstools.config.Paths;
import org.emercit.utilstools.config.DefSettings;
import org.emercit.utilstools.config.Msg;
import org.emercit.utilstools.ethmanager.model.EthBean;
import org.emercit.utilstools.pckutils.cmd.CmdExec;
import org.emercit.xmldbmanager.service.Db;
import org.emercit.pckutils.cmd.CmdExec;
public class EthLinux implements IEth {
......
package org.emercit.ethmanager.service;
package org.emercit.utilstools.ethmanager.service;
import java.util.Vector;
import org.emercit.ethmanager.model.*;
import org.emercit.utilstools.ethmanager.model.*;
public interface IEth {
......
package org.emercit.gsmmanager.model;
package org.emercit.utilstools.gsmmanager.model;
import java.io.Serializable;
import java.util.Vector;
......
package org.emercit.gsmmanager.service;
package org.emercit.utilstools.gsmmanager.service;
import org.emercit.gsmmanager.model.GSMBean;
import org.emercit.utilstools.config.Paths;
import org.emercit.xmldbmanager.service.Db;
import org.emercit.utilstools.config.DefSettings;
import org.emercit.utilstools.config.Paths;
import org.emercit.utilstools.config.Msg;
import org.emercit.utilstools.gsmmanager.model.GSMBean;
public class Gsm implements IGsm {
......
package org.emercit.gsmmanager.service;
package org.emercit.utilstools.gsmmanager.service;
import org.emercit.gsmmanager.model.GSMBean;
import org.emercit.utilstools.gsmmanager.model.GSMBean;
public interface IGsm {
......
package org.emercit.logreader;
package org.emercit.utilstools.logreader;
import java.io.BufferedReader;
import java.io.FileInputStream;
......
......@@ -5,4 +5,4 @@
* @author root
*
*/
package org.emercit.logreader;
\ No newline at end of file
package org.emercit.utilstools.logreader;
\ No newline at end of file
......
......@@ -2,14 +2,14 @@ package org.emercit.utilstools.model;
import java.util.Vector;
import org.emercit.devinfo.model.DevInfoBean;
import org.emercit.dnsmanager.model.DnsBean;
import org.emercit.dtmanager.model.DateInfo;
import org.emercit.gsmmanager.model.GSMBean;
import org.emercit.ethmanager.model.EthBean;
import org.emercit.proxymanager.model.ProxyBean;
import org.emercit.servers.model.ServerBean;
import org.emercit.svmanager.model.SvBean;
import org.emercit.utilstools.devinfo.model.DevInfoBean;
import org.emercit.utilstools.dnsmanager.model.DnsBean;
import org.emercit.utilstools.dtmanager.model.DateInfo;
import org.emercit.utilstools.ethmanager.model.EthBean;
import org.emercit.utilstools.gsmmanager.model.GSMBean;
import org.emercit.utilstools.proxymanager.model.ProxyBean;
import org.emercit.utilstools.servers.model.ServerBean;
import org.emercit.utilstools.svmanager.model.SvBean;
import java.io.Serializable;
......
package org.emercit.pckutils.checkservice;
package org.emercit.utilstools.pckutils.checkservice;
import org.emercit.pckutils.cmd.CmdExec;
import org.emercit.utilstools.config.Paths;
import org.emercit.utilstools.pckutils.cmd.CmdExec;
import java.util.Vector;
......
package org.emercit.pckutils.cmd;
package org.emercit.utilstools.pckutils.cmd;
import java.io.BufferedReader;
......@@ -9,7 +9,7 @@ import java.util.Random;
import java.util.Vector;
import org.apache.log4j.Logger;
import org.emercit.devinfo.service.DevInfo;
import org.emercit.utilstools.devinfo.service.DevInfo;
......
package org.emercit.pckutils.cmd;
package org.emercit.utilstools.pckutils.cmd;
import java.util.Vector;
import org.apache.log4j.Logger;
import org.emercit.dtmanager.service.NtpLinux;
import org.emercit.utilstools.dtmanager.service.NtpLinux;
public class CmdLog {
......
package org.emercit.proxymanager.model;
package org.emercit.utilstools.proxymanager.model;
import java.io.Serializable;
......
package org.emercit.proxymanager.service;
package org.emercit.utilstools.proxymanager.service;
public interface IProxy {
......
package org.emercit.proxymanager.service;
package org.emercit.utilstools.proxymanager.service;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.util.Vector;
import org.apache.log4j.Logger;
import org.emercit.proxymanager.model.ProxyBean;
import org.emercit.utilstools.config.Paths;
import org.emercit.utilstools.config.Msg;
import org.emercit.utilstools.config.DefSettings;
import org.emercit.utilstools.proxymanager.model.ProxyBean;
import org.emercit.xmldbmanager.service.Db;
......@@ -68,11 +68,17 @@ public class ProxyLinux implements IProxy {
}
bw.write("\n");
bw.close();
return db.create(pbs);
int value=db.create(pbs);
if (Msg.getByCode(value).getTypeVariable().getCode()==1) {
return Msg.ProxyUpdateError.getCode();
}
return Msg.ProxyUpdateSucc.getCode();
} catch (IOException e) {
log.error(e.getMessage());
return Msg.SaveFileError.getCode();
log.error(Msg.ProxyUpdateError.getDescription());
return Msg.ProxyUpdateError.getCode();
}
}
......
package org.emercit.servers.service;
package org.emercit.utilstools.servers.service;
import java.util.Vector;
import org.emercit.servers.model.ServerBean;
import org.emercit.utilstools.servers.model.ServerBean;
public interface IServers {
......
package org.emercit.servers.service;
package org.emercit.utilstools.servers.service;
import java.util.Vector;
import java.beans.XMLEncoder;
......@@ -9,10 +9,10 @@ import java.io.FileOutputStream;
import java.io.FileInputStream;
import org.apache.log4j.Logger;
import org.emercit.servers.model.ServerBean;
import org.emercit.servers.service.IServers;
import org.emercit.utilstools.config.Paths;
import org.emercit.utilstools.config.DefSettings;
import org.emercit.utilstools.servers.model.ServerBean;
import org.emercit.utilstools.servers.service.IServers;
import org.emercit.xmldbmanager.service.Db;
public class Servers implements IServers {
......
......@@ -5,19 +5,18 @@ import java.util.Vector;
import org.emercit.utilstools.config.Msg;
import org.emercit.utilstools.config.Paths;
import org.emercit.utilstools.model.SettingsBean;
import org.emercit.utilstools.proxymanager.service.ProxyLinux;
import org.emercit.utilstools.servers.service.Servers;
import org.emercit.utilstools.svmanager.service.Sv;
import org.emercit.xmldbmanager.service.Db;
import org.emercit.dtmanager.model.DateInfo;
import org.emercit.ethmanager.model.EthBean;
import org.emercit.devinfo.service.DevInfo;
import org.emercit.dnsmanager.service.DnsLinux;
import org.emercit.dtmanager.service.NtpLinux;
import org.emercit.gsmmanager.service.Gsm;
import org.emercit.ethmanager.service.EthLinux;
import org.emercit.proxymanager.service.ProxyLinux;
import org.emercit.servers.service.Servers;
import org.emercit.svmanager.service.Sv;
import org.emercit.utilstools.config.Msg;
import org.emercit.utilstools.devinfo.service.DevInfo;
import org.emercit.utilstools.dnsmanager.service.DnsLinux;
import org.emercit.utilstools.dtmanager.model.DateInfo;
import org.emercit.utilstools.dtmanager.service.NtpLinux;
import org.emercit.utilstools.ethmanager.model.EthBean;
import org.emercit.utilstools.ethmanager.service.EthLinux;
import org.emercit.utilstools.gsmmanager.service.Gsm;
public class Settings implements ISettings {
......
package org.emercit.sshexec;
package org.emercit.utilstools.sshexec;
import java.util.Properties;
......@@ -13,6 +13,8 @@ import java.io.OutputStream;
import org.apache.log4j.Logger;
import org.emercit.utilstools.config.DefSettings;
public class SSHExec {
......@@ -30,10 +32,20 @@ public class SSHExec {
private String cmd;
/*
* По умолчанию команды выполняются от рута на локальном хосте
*/
public SSHExec() {
config.put("StrictHostKeyChecking", "no");
this.host=DefSettings.ssh_host;
this.port=DefSettings.ssh_port;
this.login=DefSettings.ssh_login;
this.password=DefSettings.ssh_password;
this.cmd="";
}
public void setLogin(String value) {
this.login=value;
}
......
package org.emercit.svmanager.model;
package org.emercit.utilstools.svmanager.model;
import java.io.Serializable;
import java.util.Vector;
......
......@@ -5,4 +5,4 @@
* @author root
*
*/
package org.emercit.svmanager.model;
\ No newline at end of file
package org.emercit.utilstools.svmanager.model;
\ No newline at end of file
......
package org.emercit.svmanager.service;
package org.emercit.utilstools.svmanager.service;
import org.emercit.svmanager.model.SvBean;
import org.emercit.utilstools.svmanager.model.SvBean;
import java.util.Vector;
......
package org.emercit.svmanager.service;
package org.emercit.utilstools.svmanager.service;
public interface ISvControl {
......
package org.emercit.svmanager.service;
package org.emercit.utilstools.svmanager.service;
import java.util.Vector;
import org.emercit.svmanager.model.SvBean;
import org.emercit.xmldbmanager.service.Db;
import org.emercit.svmanager.service.SvControl;
import org.emercit.utilstools.config.Paths;
import org.emercit.utilstools.config.DefSettings;
import org.emercit.utilstools.svmanager.model.SvBean;
import org.emercit.utilstools.svmanager.service.SvControl;
public class Sv {
......
package org.emercit.svmanager.service;
package org.emercit.utilstools.svmanager.service;
import org.apache.log4j.Logger;
import org.emercit.devinfo.service.DevInfo;
import org.emercit.pckutils.cmd.CmdExec;
import org.emercit.utilstools.config.Paths;
import org.emercit.utilstools.config.Msg;
import org.emercit.svmanager.model.SvBean;
import org.emercit.pckutils.checkservice.STService;
import org.emercit.utilstools.devinfo.service.DevInfo;
import org.emercit.utilstools.pckutils.checkservice.STService;
import org.emercit.utilstools.pckutils.cmd.CmdExec;
import org.emercit.utilstools.pckutils.cmd.CmdLog;
import org.emercit.utilstools.sshexec.SSHExec;
import org.emercit.utilstools.svmanager.model.SvBean;
import java.util.Vector;
import org.emercit.pckutils.cmd.CmdLog;
public class SvControl implements ISvControl {
private static final Logger log = Logger.getLogger(SvControl.class);
private CmdExec cmdexec=new CmdExec();
private CmdLog cmdLog=new CmdLog();
private SSHExec sshexec;
private STService st=new STService();
......@@ -25,7 +27,22 @@ public class SvControl implements ISvControl {
private int typeCode;
public SvControl(SvBean svbean) {
this.svbean=svbean;
this.sshexec=new SSHExec();
this.sshexec.setHost("");
/*
private String login;
private String password;
private String host;
private int port;
private String cmd;
*/
}
/*
* Остановка процесса
......@@ -35,8 +52,9 @@ public class SvControl implements ISvControl {
try {
cmdLog.print(cmdexec.Run(Paths.dirInit_d+this.svbean.getProcess()+" "+"stop"));
sshexec.setCmd(Paths.dirInit_d+this.svbean.getProcess()+" "+"stop");
sshexec.Exec();
Thread.sleep(this.svbean.getStoptime());
if(st.IsRun(this.svbean.getProcess())) { //если еще запущен
......@@ -60,7 +78,8 @@ public class SvControl implements ISvControl {
try {
cmdLog.print(cmdexec.Run(Paths.dirInit_d+this.svbean.getProcess()+" "+"start"));
sshexec.setCmd(Paths.dirInit_d+this.svbean.getProcess()+" "+"start");
sshexec.Exec();
Thread.sleep(this.svbean.getStarttime());
......@@ -85,7 +104,6 @@ public class SvControl implements ISvControl {
*/
public int restart() {
try {
typeCode =Msg.getByCode(stop()).getTypeVariable().getCode();
......@@ -118,7 +136,9 @@ public class SvControl implements ISvControl {
*/
public int addAutoRun() {
try {
cmdLog.print(cmdexec.Run("update-rc.d "+this.svbean.getProcess()+" defaults"));
sshexec.setCmd("update-rc.d "+this.svbean.getProcess()+" defaults");
sshexec.Exec();
}catch(Exception e) {
return Msg.ProcessAddAutoRunError.getCode();
};
......@@ -132,11 +152,12 @@ public class SvControl implements ISvControl {
public int delAutoRun() {
try {
cmdLog.print(cmdexec.Run("update-rc.d -f "+this.svbean.getProcess()+" remove"));
sshexec.setCmd("update-rc.d -f "+this.svbean.getProcess()+" remove");
sshexec.Exec();
}catch(Exception e) {
return Msg.ProcessDelAutoRunError.getCode();
};
return Msg.ProcessDelAutoRunSucc.getCode();
}
......
......@@ -5,4 +5,4 @@
* @author root
*
*/
package org.emercit.svmanager.service;
\ No newline at end of file
package org.emercit.utilstools.svmanager.service;
\ No newline at end of file
......
......@@ -8,9 +8,9 @@ import java.io.FileInputStream;
import java.io.FileOutputStream;
import org.apache.log4j.Logger;
import org.emercit.devinfo.service.DevInfo;
import org.emercit.utilstools.config.Msg;
import org.emercit.utilstools.config.Paths;
import org.emercit.utilstools.devinfo.service.DevInfo;
public class Db implements IDb {
......
......@@ -10,11 +10,11 @@ import static org.junit.Assert.*;
import java.util.Vector;
import org.emercit.utilstools.config.Msg;
import org.emercit.utilstools.ethmanager.model.EthBean;
import org.emercit.utilstools.ethmanager.service.EthLinux;
import org.junit.Before;
import org.junit.After;
import org.junit.Ignore;
import org.emercit.ethmanager.model.EthBean;
import org.emercit.ethmanager.service.EthLinux;
@Ignore
public class TestEthLinux extends TestCase {
......
......@@ -5,16 +5,15 @@ import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import static org.junit.Assert.*;
import java.util.Vector;
import org.emercit.utilstools.config.Msg;
import org.junit.Before;
import org.junit.After;
import org.emercit.proxymanager.model.ProxyBean;
import org.emercit.proxymanager.service.ProxyLinux;
import org.emercit.utilstools.config.Msg;
import org.emercit.utilstools.proxymanager.model.ProxyBean;
import org.emercit.utilstools.proxymanager.service.ProxyLinux;
public class TestProxyLinux extends TestCase {
......
......@@ -11,13 +11,13 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.emercit.svmanager.service.SvControl;
import org.emercit.svmanager.service.Sv;
import org.emercit.svmanager.model.SvBean;
import java.util.Vector;
import org.emercit.utilstools.config.Msg;
import org.emercit.utilstools.svmanager.model.SvBean;
import org.emercit.utilstools.svmanager.service.Sv;
import org.emercit.utilstools.svmanager.service.SvControl;
@Ignore
public class TestSvControl extends TestCase {
......