Skip to content

Logging original1 #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jswager merged 3 commits into from
Nov 6, 2013
Merged

Logging original1 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f91bcc6
improved exception handling in build steps
elordahl Oct 23, 2013
7413462
Adding "Resume" to PowerOn title
elordahl Oct 23, 2013
db67042
maintain backward compatibility
elordahl Nov 2, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions ...e/builders/VSphereBuildStepContainer.java → ...ns/vsphere/VSphereBuildStepContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jenkinsci.plugins.vsphere.builders;
package org.jenkinsci.plugins.vsphere;

import hudson.DescriptorExtensionList;
import hudson.Extension;
import hudson.Launcher;
import hudson.init.InitMilestone;
import hudson.init.Initializer;
import hudson.model.BuildListener;
import hudson.model.Items;
import hudson.model.AbstractBuild;
import hudson.model.AbstractProject;
import hudson.model.Hudson;
Expand All @@ -29,8 +32,8 @@
import java.io.PrintStream;

import org.jenkinsci.plugins.vSphereCloud;
import org.jenkinsci.plugins.vsphere.VSphereBuildStep;
import org.jenkinsci.plugins.vsphere.VSphereBuildStep.VSphereBuildStepDescriptor;
import org.jenkinsci.plugins.vsphere.builders.Messages;
import org.jenkinsci.plugins.vsphere.tools.VSphere;
import org.jenkinsci.plugins.vsphere.tools.VSphereException;
import org.jenkinsci.plugins.vsphere.tools.VSphereLogger;
Expand Down Expand Up @@ -65,7 +68,7 @@ public boolean perform(final AbstractBuild<?, ?> build, final Launcher launcher,

return buildStep.perform(build, launcher, listener);
} catch (Exception e) {
e.printStackTrace();
VSphereLogger.vsLogger(listener.getLogger(), e.getMessage());
}
return false;
}
Expand All @@ -81,6 +84,14 @@ private void startLogs(PrintStream logger){
@Extension
public static final class VSphereBuildStepContainerDescriptor extends BuildStepDescriptor<Builder> {

@Initializer(before=InitMilestone.PLUGINS_STARTED)
public static void addAliases() {
Items.XSTREAM2.addCompatibilityAlias(
"org.jenkinsci.plugins.vsphere.builders.VSphereBuildStepContainer",
VSphereBuildStepContainer.class
);
}

@Override
public String getDisplayName() {
return Messages.plugin_title_BuildStep();
Expand Down
16 changes: 2 additions & 14 deletions src/main/java/org/jenkinsci/plugins/vsphere/builders/ConvertToTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,8 @@ public boolean isForce() {
return force;
}

@Override
public boolean perform(final AbstractBuild<?, ?> build, final Launcher launcher, final BuildListener listener) {

PrintStream jLogger = listener.getLogger();
boolean changed = false;

try {
changed = convert(build, launcher, listener);
}
catch (VSphereException e) {
VSphereLogger.vsLogger(jLogger, e.getMessage());
}

return changed;
public boolean perform(final AbstractBuild<?, ?> build, final Launcher launcher, final BuildListener listener) throws VSphereException {
return convert(build, launcher, listener);
}

private boolean convert(final AbstractBuild<?, ?> build, final Launcher launcher, final BuildListener listener) throws VSphereException {
Expand Down
16 changes: 2 additions & 14 deletions src/main/java/org/jenkinsci/plugins/vsphere/builders/ConvertToVm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,20 +60,8 @@ public String getResourcePool() {
return resourcePool;
}

@Override
public boolean perform(final AbstractBuild<?, ?> build, final Launcher launcher, final BuildListener listener) {

PrintStream jLogger = listener.getLogger();
boolean changed = false;

try {
changed = convert(build, launcher, listener);
}
catch (VSphereException e) {
VSphereLogger.vsLogger(jLogger, e.getMessage());
}

return changed;
public boolean perform(final AbstractBuild<?, ?> build, final Launcher launcher, final BuildListener listener) throws VSphereException {
return convert(build, launcher, listener);
}

private boolean convert(final AbstractBuild<?, ?> build, final Launcher launcher, final BuildListener listener) throws VSphereException {
Expand Down
25 changes: 8 additions & 17 deletions src/main/java/org/jenkinsci/plugins/vsphere/builders/Delete.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,23 +54,14 @@ public boolean isFailOnNoExist(){
return failOnNoExist;
}

@Override
public boolean perform(final AbstractBuild<?, ?> build, final Launcher launcher, final BuildListener listener) {
public boolean perform(final AbstractBuild<?, ?> build, final Launcher launcher, final BuildListener listener) throws VSphereException {

PrintStream jLogger = listener.getLogger();
boolean killed = false;

try {
if(allowDelete())
killed = killVm(build, launcher, listener);
else
VSphereLogger.vsLogger(jLogger, "Deletion is disabled!");
}
catch (VSphereException e) {
VSphereLogger.vsLogger(jLogger, e.getMessage());
}
if(allowDelete())
return killVm(build, launcher, listener);
else
VSphereLogger.vsLogger(listener.getLogger(), "Deletion is disabled!");

return killed;
return false;
}

private boolean killVm(final AbstractBuild<?, ?> build, final Launcher launcher, final BuildListener listener) throws VSphereException {
Expand Down Expand Up @@ -127,10 +118,10 @@ public FormValidation doTestData(@QueryParameter String serverName,
VirtualMachine vmObj = vsphere.getVmByName(vm);
if (vmObj == null)
return FormValidation.error(Messages.validation_notFound("VM"));

if (vmObj.getConfig().template)
return FormValidation.error(Messages.validation_notActually("VM"));

return FormValidation.ok(Messages.validation_success());
} catch (Exception e) {
throw new RuntimeException(e);
Expand Down
16 changes: 2 additions & 14 deletions src/main/java/org/jenkinsci/plugins/vsphere/builders/Deploy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,21 +74,9 @@ public String getResourcePool() {
return resourcePool;
}

@Override
public boolean perform(final AbstractBuild<?, ?> build, final Launcher launcher, final BuildListener listener) {

PrintStream jLogger = listener.getLogger();
boolean success=false;

try{
success = deployFromTemplate(build, launcher, listener);
}
catch(VSphereException e){
VSphereLogger.vsLogger(jLogger, e.getMessage());
}

public boolean perform(final AbstractBuild<?, ?> build, final Launcher launcher, final BuildListener listener) throws VSphereException {
return deployFromTemplate(build, launcher, listener);
//TODO throw AbortException instead of returning value
return success;
}

private boolean deployFromTemplate(final AbstractBuild<?, ?> build, final Launcher launcher, final BuildListener listener) throws VSphereException {
Expand Down
17 changes: 3 additions & 14 deletions src/main/java/org/jenkinsci/plugins/vsphere/builders/PowerOff.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,9 @@ public String getVm() {
return vm;
}

@Override
public boolean perform(final AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener) {
PrintStream jLogger = listener.getLogger();
boolean success=false;

try{
success = powerOff(build, launcher, listener);
}
catch(VSphereException e){
VSphereLogger.vsLogger(jLogger, e.getMessage());
}

public boolean perform(final AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener) throws VSphereException {
return powerOff(build, launcher, listener);
//TODO throw AbortException instead of returning value
return success;
}

private boolean powerOff(final AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener) throws VSphereException{
Expand Down Expand Up @@ -120,7 +109,7 @@ public FormValidation doTestData(@QueryParameter String serverName,
VirtualMachine vmObj = vsphere.getVmByName(vm);
if ( vmObj == null)
return FormValidation.error(Messages.validation_notFound("VM"));

if (vmObj.getConfig().template)
return FormValidation.error(Messages.validation_notActually("VM"));

Expand Down
17 changes: 3 additions & 14 deletions src/main/java/org/jenkinsci/plugins/vsphere/builders/PowerOn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,20 +57,9 @@ public int getTimeoutInSeconds() {
return timeoutInSeconds;
}

@Override
public boolean perform(final AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener) {
PrintStream jLogger = listener.getLogger();
boolean success=false;

try{
success = powerOn(build, launcher, listener);
}
catch(VSphereException e){
VSphereLogger.vsLogger(jLogger, e.getMessage());
}

public boolean perform(final AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener) throws VSphereException {
return powerOn(build, launcher, listener);
//TODO throw AbortException instead of returning value
return success;
}

private boolean powerOn(final AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener) throws VSphereException{
Expand Down Expand Up @@ -146,7 +135,7 @@ public FormValidation doTestData(@QueryParameter String serverName,
VirtualMachine vmObj = vsphere.getVmByName(vm);
if ( vmObj == null)
return FormValidation.error(Messages.validation_notFound("VM"));

if (vmObj.getConfig().template)
return FormValidation.error(Messages.validation_notActually("VM"));

Expand Down
15 changes: 2 additions & 13 deletions src/main/java/org/jenkinsci/plugins/vsphere/builders/RevertToSnapshot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,9 @@ public String getSnapshotName() {
return snapshotName;
}

@Override
public boolean perform(final AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener) {
PrintStream jLogger = listener.getLogger();
boolean success=false;

try{
success = revertToSnapshot(build, launcher, listener);
}
catch(VSphereException e){
VSphereLogger.vsLogger(jLogger, e.getMessage());
}

public boolean perform(final AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener) throws VSphereException {
return revertToSnapshot(build, launcher, listener);
//TODO throw AbortException instead of returning value
return success;
}

private boolean revertToSnapshot(final AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener) throws VSphereException{
Expand Down
15 changes: 2 additions & 13 deletions src/main/java/org/jenkinsci/plugins/vsphere/builders/SuspendVm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,9 @@ public String getVm() {
return vm;
}

@Override
public boolean perform(final AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener) {
PrintStream jLogger = listener.getLogger();
boolean success=false;

try{
success = suspend(build, launcher, listener);
}
catch(VSphereException e){
VSphereLogger.vsLogger(jLogger, e.getMessage());
}

public boolean perform(final AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener) throws VSphereException {
return suspend(build, launcher, listener);
//TODO throw AbortException instead of returning value
return success;
}

private boolean suspend(final AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener) throws VSphereException{
Expand Down
15 changes: 2 additions & 13 deletions src/main/java/org/jenkinsci/plugins/vsphere/builders/TakeSnapshot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,20 +64,9 @@ public boolean isIncludeMemory(){
return includeMemory;
}

@Override
public boolean perform(final AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener) {
PrintStream jLogger = listener.getLogger();
boolean success=false;

try{
success = takeSnapshot(build, launcher, listener);
}
catch(VSphereException e){
VSphereLogger.vsLogger(jLogger, e.getMessage());
}

public boolean perform(final AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener) throws VSphereException {
return takeSnapshot(build, launcher, listener);
//TODO throw AbortException instead of returning value
return success;
}

private boolean takeSnapshot(final AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener) throws VSphereException{
Expand Down
0 ...rs/VSphereBuildStepContainer/config.jelly → ...re/VSphereBuildStepContainer/config.jelly
View file
Open in desktop
File renamed without changes.
0 ...reBuildStepContainer/help-serverName.html → ...reBuildStepContainer/help-serverName.html
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions src/main/resources/org/jenkinsci/plugins/vsphere/builders/Messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ vm.title.Delete=Delete VM (DESTRUCTIVE)
vm.title.Deploy=Deploy VM from template
vm.title.ConvertToTemplate=Convert VM to a template
vm.title.ConvertToVM=Convert template to a VM
vm.title.PowerOn=Power on VM
vm.title.PowerOff=Power off VM
vm.title.PowerOn=Power-On/Resume VM
vm.title.PowerOff=Power-Off VM
vm.title.SuspendVM=Suspend VM
vm.title.RevertToSnapshot=Revert to Snapshot
vm.title.TakeSnapshot=Take snapshot
Expand Down