|
@@ -80,7 +80,7 @@ void service_maintain::ProcessData(QByteArray & ba)
|
|
|
|
|
|
void service_maintain::StartService()
|
|
|
{
|
|
|
- if((mnServcieStatus == 1))
|
|
|
+ if(mnServcieStatus == 1)
|
|
|
{
|
|
|
std::cout<<" Service is Opening. "<<std::endl;
|
|
|
BroadStatus();
|
|
@@ -105,6 +105,7 @@ void service_maintain::StartService()
|
|
|
mstrError = "No frpc program.";
|
|
|
mnServcieStatus = 0;
|
|
|
std::cout<<"No frpc program."<<std::endl;
|
|
|
+ BroadStatus();
|
|
|
return;
|
|
|
}
|
|
|
|
|
@@ -114,6 +115,7 @@ void service_maintain::StartService()
|
|
|
mstrError = "frpc program is not executable.";
|
|
|
mnServcieStatus = 0;
|
|
|
std::cout<<"frpc program is not executable."<<std::endl;
|
|
|
+ BroadStatus();
|
|
|
return;
|
|
|
}
|
|
|
|
|
@@ -163,11 +165,13 @@ std::string service_maintain::CreateIniFile()
|
|
|
snprintf(strline,1000,"server_port = %s\n",mparam.mstrserverport.data());xFile.write(strline,strnlen(strline,1000));
|
|
|
snprintf(strline,1000,"token = %s\n",mparam.mstrtoken.data());xFile.write(strline,strnlen(strline,1000));
|
|
|
snprintf(strline,1000,"\n");xFile.write(strline,strnlen(strline,1000));
|
|
|
- snprintf(strline,1000,"[nomachine_tcp]\n");xFile.write(strline,strnlen(strline,1000));
|
|
|
+// snprintf(strline,1000,"[nomachine_tcp]\n",mnServiceCode);xFile.write(strline,strnlen(strline,1000));
|
|
|
+ snprintf(strline,1000,"[nomachine_tcp_%d]\n",mnServiceCode);xFile.write(strline,strnlen(strline,1000));
|
|
|
snprintf(strline,1000,"type = tcp\n");xFile.write(strline,strnlen(strline,1000));
|
|
|
snprintf(strline,1000,"local_ip = 127.0.0.1\n");xFile.write(strline,strnlen(strline,1000));
|
|
|
snprintf(strline,1000,"local_port = %s\n",mparam.mstrnomachineport.data());xFile.write(strline,strnlen(strline,1000));
|
|
|
snprintf(strline,1000,"remote_port = %d\n",mnServiceCode);xFile.write(strline,strnlen(strline,1000));
|
|
|
+// snprintf(strline,1000,"remote_port = %d\n",14000);xFile.write(strline,strnlen(strline,1000));
|
|
|
xFile.close();
|
|
|
return mstrIniFile;
|
|
|
|
|
@@ -220,6 +224,22 @@ void service_maintain::onReadStandardOutput()
|
|
|
std::cout<<"token error.Please Check xml, Maybe token not correct. "<<std::endl;
|
|
|
BroadStatus();//Send Status Code.
|
|
|
}
|
|
|
+ if(str.contains("start error: port already used"))
|
|
|
+ {
|
|
|
+ mnServiceCode = -5;
|
|
|
+ mstrError = "port already used.Please re start. ";
|
|
|
+ mnServcieStatus = 0;
|
|
|
+ std::cout<<"port already used.Please re start. "<<std::endl;
|
|
|
+ BroadStatus();//Send Status Code.
|
|
|
+ }
|
|
|
+ if(str.contains("] is already in use"))
|
|
|
+ {
|
|
|
+ mnServiceCode = -6;
|
|
|
+ mstrError = "Service Name already used.Please re start. ";
|
|
|
+ mnServcieStatus = 0;
|
|
|
+ std::cout<<"Service Name already used.Please re start. "<<std::endl;
|
|
|
+ BroadStatus();//Send Status Code.
|
|
|
+ }
|
|
|
if(str.contains("start proxy success"))
|
|
|
{
|
|
|
mstrError = "Success.";
|