Menu
▾
▴
[Smartfrog-checkins] core/components/arithmetic-testharness/src/org/smartfrog/services/runcmd InfoProcess.java,1.1,1.2 RunProcess.java,1.2,1.3 SFRunCommand.java,1.2,1.3
|
From: Kumaravel G. <kum...@us...> - 2005-05-11 12:02:43
|
Update of /cvsroot/smartfrog/core/components/arithmetic-testharness/src/org/smartfrog/services/runcmd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28646/runcmd Modified Files: InfoProcess.java RunProcess.java SFRunCommand.java Log Message: bug fix Index: RunProcess.java =================================================================== RCS file: /cvsroot/smartfrog/core/components/arithmetic-testharness/src/org/smartfrog/services/runcmd/RunProcess.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RunProcess.java 1 Mar 2005 11:37:54 -0000 1.2 --- RunProcess.java 11 May 2005 12:02:34 -0000 1.3 *************** *** 25,28 **** --- 25,29 ---- public class RunProcess extends Thread { + static int count = 0; /** * Description of the Field *************** *** 280,284 **** --- 281,287 ---- */ public void clean() { + this.subProcess.destroy(); + System.out.println("RunProcess.clean=============>"); this.status = "stopped"; } *************** *** 288,297 **** */ public void run() { String terminationType = "normal"; ! do { try { ! //this.log("Command Start: "+command,3); this.log("RunProcessInfo > " + this.toString(), 5); ! this.log("Started "+"[" + this.nameProcess + "]> " + this.getCommand() + "| workdir: " + this.getWorkDir() + " ", 2); subProcess = runtime.exec(command, envProp, workDir); --- 291,307 ---- */ public void run() { + String terminationType = "normal"; ! do { try { ! // this.log("Command Start: "+command.toString() ,3); ! //System.out.println("COUNT=====" + count++); ! ! /*if (count == 2){ ! System.out.println("Breaking=============because of Count value>"); ! break; ! }*/ this.log("RunProcessInfo > " + this.toString(), 5); ! // this.log("Started "+"[" + this.nameProcess + "]> " + this.getCommand() + "| workdir: " + this.getWorkDir() + " ", 2); subProcess = runtime.exec(command, envProp, workDir); *************** *** 334,338 **** outputGobbler.start();//india- team changes this.log("Process (re)started,"+"[" + this.nameProcess + "]> ", 3); ! status = "running"; int exitVal = subProcess.waitFor(); // wait until process finishes --- 344,348 ---- outputGobbler.start();//india- team changes this.log("Process (re)started,"+"[" + this.nameProcess + "]> ", 3); ! this.status = "running"; int exitVal = subProcess.waitFor(); // wait until process finishes *************** *** 340,348 **** this.log("Exit Val "+"[" + this.nameProcess + "]>"+ exitVal + "", 2); ! this.clean(); if(exitVal == 0) { terminationType = "normal"; if ((this.sfObj instanceof SFRunCommand) && (((SFRunCommand)this.sfObj).printMsgImp != null)) { ((SFRunCommand)this.sfObj).printMsgImp.printMsg("NORMAL Termination. "+"Exit Val "+"[" + this.nameProcess + "]>"+ exitVal + ""); } --- 350,361 ---- this.log("Exit Val "+"[" + this.nameProcess + "]>"+ exitVal + "", 2); ! System.out.println("In RunPreocess ===========> Status" + this.status); ! ! // this.clean(); if(exitVal == 0) { terminationType = "normal"; if ((this.sfObj instanceof SFRunCommand) && (((SFRunCommand)this.sfObj).printMsgImp != null)) { + System.out.println("In RunPreocess ===========> NORMAL Termination"); ((SFRunCommand)this.sfObj).printMsgImp.printMsg("NORMAL Termination. "+"Exit Val "+"[" + this.nameProcess + "]>"+ exitVal + ""); } *************** *** 353,358 **** --- 366,373 ---- } } + if (stop) { + System.out.println("In RunPreocess ===========> if(stop) "); break; } *************** *** 360,363 **** --- 375,380 ---- Thread.sleep(delay); } catch (Exception ex) { + System.out.println("EXCEPTION AFTER STARTING THE APP");// india team changes + ex.printStackTrace(); // india team changes terminationType = "abnormal"; this.log("Problem starting "+"[" + this.nameProcess + "]> " + ex.getMessage() + ", " + this.toString(), 1); *************** *** 377,389 **** Thread.sleep(10 * 1000); } catch (Exception e) { ! //e.printStackTrace(); } } } while (reStart); ! if (shouldTerminate) { // Do a propper terminate of the whole lot!!! ! if (shouldDetach) detach(); ! terminate(terminationType); ! } else if (shouldDetach) { detach(); } --- 394,423 ---- Thread.sleep(10 * 1000); } catch (Exception e) { ! e.printStackTrace(); } } + } while (reStart); ! ! System.out.println("RunProcess==========> outside while loop");// india team changes ! if (shouldTerminate) ! System.out.println("RunProcess==========> shouldTerminate true");// india team changes ! else ! System.out.println("RunProcess==========> shouldTerminate false");// india team changes ! if (shouldTerminate) { ! // Do a propper terminate of the whole lot!!! ! if (shouldDetach) ! { ! System.out.println("RunProcess==========> T & D");// india team changes ! detach(); ! } ! System.out.println("RunProcess==========> T ");// india team changes ! terminate(terminationType); ! } ! ! ! else if (shouldDetach) { ! System.out.println("RunProcess==========> & D");// india team changes detach(); } Index: SFRunCommand.java =================================================================== RCS file: /cvsroot/smartfrog/core/components/arithmetic-testharness/src/org/smartfrog/services/runcmd/SFRunCommand.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SFRunCommand.java 1 Mar 2005 11:37:54 -0000 1.2 --- SFRunCommand.java 11 May 2005 12:02:35 -0000 1.3 *************** *** 309,312 **** --- 309,313 ---- if (runDuringDeploy) { //process.start(); + System.out.println("Inside Deploy of runcmd ==============>" ); { this.start();} } *************** *** 357,360 **** --- 358,362 ---- if ((this.autoStart)) { //process.start(); + System.out.println("Inside sfStart of runcmd ==============>" ); { this.start();} } *************** *** 393,396 **** --- 395,399 ---- createProcess(); if (process != null) { + System.out.println("Inside Start of runcmd ==============>" ); process.start(); log("SFstarted (.start()).", 3); *************** *** 492,495 **** --- 495,499 ---- String[] globalStartCmd = this.createCmd(cmdGeneral, startCmd, startAtt); String[] globalStopCmd = this.createCmd(cmdGeneral, stopCmd, stopAtt); + process = new InfoProcess(this.getNotifierId(), globalStartCmd, globalStopCmd, workDir, envProp); log("InfoProcess: "+this.getNotifierId() + " created.", 5); *************** *** 590,595 **** //Mandatory ! processName = (String)sfResolve(varSFProcessName); ! // // Not mandatory --- 594,600 ---- //Mandatory ! //processName = (String)sfResolve(varSFProcessName); ! processName = sfResolve(varSFProcessName, processName, false); ! System.out.println("Process Name =======" + processName); // // Not mandatory *************** *** 613,616 **** --- 618,622 ---- } catch (SmartFrogResolutionException e) { log(varSFCmdStop + " not found.", 5); + } *************** *** 852,856 **** cmd[i++] = cmdGeneral[1]; } ! if ((cmdStr != null) && (!(cmdStr.equals(""))) && (!(cmdStr.equals(" ")))) { cmd[i++] = cmdStr; } --- 858,862 ---- cmd[i++] = cmdGeneral[1]; } ! if ((cmdStr != null) && !(cmdStr.equals("NULL")) && (!(cmdStr.equals(""))) && (!(cmdStr.equals(" ")))) { cmd[i++] = cmdStr; } Index: InfoProcess.java =================================================================== RCS file: /cvsroot/smartfrog/core/components/arithmetic-testharness/src/org/smartfrog/services/runcmd/InfoProcess.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** InfoProcess.java 12 May 2004 11:49:35 -0000 1.1 --- InfoProcess.java 11 May 2005 12:02:34 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- import org.smartfrog.services.runcmd.RunProcess; import org.smartfrog.sfcore.prim.*; + import org.smartfrog.sfcore.common.SFNull; /** *************** *** 172,176 **** return; } ! //System.out.println("process.Start:stating -"+this.getProcessName()); cleanProcess(); process = new RunProcess(this.startCmdAtt, this.workDir, this.processName, this.envProp); --- 173,177 ---- return; } ! System.out.println("process.Start:stating -"+this.getProcessName()); cleanProcess(); process = new RunProcess(this.startCmdAtt, this.workDir, this.processName, this.envProp); *************** *** 178,182 **** process.start(); this.statusInfo = "Started"; ! //System.out.println("process.Start:started -"+this.getProcessName()); } --- 179,183 ---- process.start(); this.statusInfo = "Started"; ! System.out.println("process.Start:started -"+this.getProcessName()); } *************** *** 187,201 **** cleanProcess(); // Review this for not killing it! Use an auxiliary process. ! //System.out.println("process.Stop:stopping -"+this.getProcessName()+" Cmd:"+this.stopCmd); ! if (this.stopCmdAtt != null) { ! process = new RunProcess(this.stopCmdAtt, this.workDir, this.processName, this.envProp); setProcessParam(); process.start(); this.statusInfo = "Stopped"; ! } else { //process=new RunProcess(this.startCmd+" "+this.startAtt, this.workDir, this.processName); this.statusInfo = "Stopped(no Stop cmd)"; ! } ! //System.out.println("process.Stop:stop end -"+this.getProcessName()); } --- 188,208 ---- cleanProcess(); // Review this for not killing it! Use an auxiliary process. ! ! //System.out.println("process.Stop:stopping =====>"+ this.getProcessName() + " Cmd:"+ this.stopCmdAtt); ! //System.out.println("process.Stop:stopping =====>"+ this.getProcessName() + " Cmd:"+ this.getCmd()); ! ! /* if (this.stopCmdAtt != null) { ! process = new RunProcess(stopCmdAtt, this.workDir, this.processName, this.envProp); setProcessParam(); process.start(); this.statusInfo = "Stopped"; ! // } else { //process=new RunProcess(this.startCmd+" "+this.startAtt, this.workDir, this.processName); + */ this.statusInfo = "Stopped(no Stop cmd)"; ! //} ! System.out.println("Stopcmd depricated"); ! System.out.println("process.Stop:stop end -"+this.getProcessName()); ! System.out.println("process.Stop:stop end -"+this.statusInfo); } |