natas_hw
/
mspsim
mirror of https://github.com/contiki-ng/mspsim
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added option to the 'service' command to not warn if the service is not found

This commit is contained in:
Niclas Finne 2011-06-07 23:45:15 +02:00
parent 8d3e1b0c4e
commit e8b7c2cd21
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/autorun.sc
View File

@ -8,10 +8,10 @@
# contikichecker
#start the nodegui service
service controlgui start
service nodegui start
service serialgui start
#service stackchart start
service -f controlgui start
service -f nodegui start
service -f serialgui start
#service -f stackchart start
#rflistener output CC2420 >> rfdata.txt
stop
#start

31
se/sics/mspsim/cli/MiscCommands.java
View File

@ -306,27 +306,40 @@ public class MiscCommands implements CommandBundle {
}
});
handler.registerCommand("service", new BasicCommand("handle service plugins", "[class name|service name] [start|stop]") {
handler.registerCommand("service", new BasicCommand("handle service plugins", "[-f] [class name|service name] [start|stop]") {
@Override
public int executeCommand(CommandContext context) {
if (context.getArgumentCount() == 0) {
int index = 0;
boolean verbose = true;
if (context.getArgumentCount() > 0 && "-f".equals(context.getArgument(index))) {
index++;
verbose = false;
}
if (context.getArgumentCount() == index) {
ServiceComponent[] sc = (ServiceComponent[]) registry.getAllComponents(ServiceComponent.class);
for (int i = 0; i < sc.length; i++) {
context.out.printf(" %-20s %s\n", sc[i].getName(), sc[i].getStatus());
if (sc.length == 0) {
context.out.println("No services found.");
} else {
for (ServiceComponent service : sc) {
context.out.printf(" %-20s %s\n", service.getName(), service.getStatus());
}
}
return 0;
}
String name = context.getArgument(0);
String name = context.getArgument(index++);
ServiceComponent sc = getServiceForName(registry, name);
if (sc == null) {
context.err.println("could not find service '" + name + "'");
return 1;
if (verbose) {
context.err.println("could not find service '" + name + "'");
return 1;
}
return 0;
}
if (context.getArgumentCount() == 1) {
if (context.getArgumentCount() == index) {
context.out.printf(" %-20s %s\n", sc.getName(), sc.getStatus());
return 0;
}
String operation = context.getArgument(1);
String operation = context.getArgument(index);
if ("start".equals(operation)) {
if (sc.getStatus() == ServiceComponent.Status.STARTED) {
context.out.println("service " + sc.getName() + " already started");