lib/jerbil/jerbil_service/sclient.rb in jerbil-1.2.2 vs lib/jerbil/jerbil_service/sclient.rb in jerbil-1.3.3
- old
+ new
@@ -303,26 +303,26 @@
@output.puts "Cannot find service through Jerbil"
end
session = my_service.connect
+ # now to do the stopping
+ begin
+ session.stop_callback(pkey)
+ @output.puts "Stopped service successfully"
+ rescue DRb::DRbConnError
+ @ouput.puts "Service stopped, but not gracefully"
+ return nil
+ end
+
rescue Jerbil::MissingServer
@output.puts("Cannot find a local Jerbil server")
rescue Jerbil::JerbilConfigError => err
@output.puts("Error in Jerbil Config File: #{err.message}")
rescue Jerbil::JerbilServiceError =>jerr
@output.puts("Error with Jerbil Service: #{jerr.message}")
rescue Jerbil::ServerConnectError
@output.puts("Error connecting to Jerbil Server")
- end
-
- # now to do the stopping
- begin
- session.stop_callback(pkey)
- @output.puts "Stopped service successfully"
- rescue DRb::DRbConnError
- @ouput.puts "Service stopped, but not gracefully"
- return nil
end
rescue Jeckyl::JeckylError => jerr
@output.puts "Error in Configuration file: #{jerr.message}"
# there is no pid, so just exit
\ No newline at end of file