Skip to content

Commit 1edb018

Browse files
jswagerjswager
committed
Merge pull request #8 from elordahl/logging-original1
Logging original1
2 parents 1fe7903 + db67042 commit 1edb018

File tree

13 files changed

+42
-131
lines changed

13 files changed

+42
-131
lines changed

src/main/java/org/jenkinsci/plugins/vsphere/builders/VSphereBuildStepContainer.java renamed to src/main/java/org/jenkinsci/plugins/vsphere/VSphereBuildStepContainer.java

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,15 @@
1212
* See the License for the specific language governing permissions and
1313
* limitations under the License.
1414
*/
15-
package org.jenkinsci.plugins.vsphere.builders;
15+
package org.jenkinsci.plugins.vsphere;
1616

1717
import hudson.DescriptorExtensionList;
1818
import hudson.Extension;
1919
import hudson.Launcher;
20+
import hudson.init.InitMilestone;
21+
import hudson.init.Initializer;
2022
import hudson.model.BuildListener;
23+
import hudson.model.Items;
2124
import hudson.model.AbstractBuild;
2225
import hudson.model.AbstractProject;
2326
import hudson.model.Hudson;
@@ -29,8 +32,8 @@
2932
import java.io.PrintStream;
3033

3134
import org.jenkinsci.plugins.vSphereCloud;
32-
import org.jenkinsci.plugins.vsphere.VSphereBuildStep;
3335
import org.jenkinsci.plugins.vsphere.VSphereBuildStep.VSphereBuildStepDescriptor;
36+
import org.jenkinsci.plugins.vsphere.builders.Messages;
3437
import org.jenkinsci.plugins.vsphere.tools.VSphere;
3538
import org.jenkinsci.plugins.vsphere.tools.VSphereException;
3639
import org.jenkinsci.plugins.vsphere.tools.VSphereLogger;
@@ -65,7 +68,7 @@ public boolean perform(final AbstractBuild<?, ?> build, final Launcher launcher,
6568

6669
return buildStep.perform(build, launcher, listener);
6770
} catch (Exception e) {
68-
e.printStackTrace();
71+
VSphereLogger.vsLogger(listener.getLogger(), e.getMessage());
6972
}
7073
return false;
7174
}
@@ -81,6 +84,14 @@ private void startLogs(PrintStream logger){
8184
@Extension
8285
public static final class VSphereBuildStepContainerDescriptor extends BuildStepDescriptor<Builder> {
8386

87+
@Initializer(before=InitMilestone.PLUGINS_STARTED)
88+
public static void addAliases() {
89+
Items.XSTREAM2.addCompatibilityAlias(
90+
"org.jenkinsci.plugins.vsphere.builders.VSphereBuildStepContainer",
91+
VSphereBuildStepContainer.class
92+
);
93+
}
94+
8495
@Override
8596
public String getDisplayName() {
8697
return Messages.plugin_title_BuildStep();

‎src/main/java/org/jenkinsci/plugins/vsphere/builders/ConvertToTemplate.java‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,8 @@ public boolean isForce() {
5454
return force;
5555
}
5656

57-
@Override
58-
public boolean perform(final AbstractBuild<?, ?> build, final Launcher launcher, final BuildListener listener) {
59-
60-
PrintStream jLogger = listener.getLogger();
61-
boolean changed = false;
62-
63-
try {
64-
changed = convert(build, launcher, listener);
65-
}
66-
catch (VSphereException e) {
67-
VSphereLogger.vsLogger(jLogger, e.getMessage());
68-
}
69-
70-
return changed;
57+
public boolean perform(final AbstractBuild<?, ?> build, final Launcher launcher, final BuildListener listener) throws VSphereException {
58+
return convert(build, launcher, listener);
7159
}
7260

7361
private boolean convert(final AbstractBuild<?, ?> build, final Launcher launcher, final BuildListener listener) throws VSphereException {

‎src/main/java/org/jenkinsci/plugins/vsphere/builders/ConvertToVm.java‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -60,20 +60,8 @@ public String getResourcePool() {
6060
return resourcePool;
6161
}
6262

63-
@Override
64-
public boolean perform(final AbstractBuild<?, ?> build, final Launcher launcher, final BuildListener listener) {
65-
66-
PrintStream jLogger = listener.getLogger();
67-
boolean changed = false;
68-
69-
try {
70-
changed = convert(build, launcher, listener);
71-
}
72-
catch (VSphereException e) {
73-
VSphereLogger.vsLogger(jLogger, e.getMessage());
74-
}
75-
76-
return changed;
63+
public boolean perform(final AbstractBuild<?, ?> build, final Launcher launcher, final BuildListener listener) throws VSphereException {
64+
return convert(build, launcher, listener);
7765
}
7866

7967
private boolean convert(final AbstractBuild<?, ?> build, final Launcher launcher, final BuildListener listener) throws VSphereException {

‎src/main/java/org/jenkinsci/plugins/vsphere/builders/Delete.java‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -54,23 +54,14 @@ public boolean isFailOnNoExist(){
5454
return failOnNoExist;
5555
}
5656

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

60-
PrintStream jLogger = listener.getLogger();
61-
boolean killed = false;
62-
63-
try {
64-
if(allowDelete())
65-
killed = killVm(build, launcher, listener);
66-
else
67-
VSphereLogger.vsLogger(jLogger, "Deletion is disabled!");
68-
}
69-
catch (VSphereException e) {
70-
VSphereLogger.vsLogger(jLogger, e.getMessage());
71-
}
59+
if(allowDelete())
60+
return killVm(build, launcher, listener);
61+
else
62+
VSphereLogger.vsLogger(listener.getLogger(), "Deletion is disabled!");
7263

73-
return killed;
64+
return false;
7465
}
7566

7667
private boolean killVm(final AbstractBuild<?, ?> build, final Launcher launcher, final BuildListener listener) throws VSphereException {
@@ -127,10 +118,10 @@ public FormValidation doTestData(@QueryParameter String serverName,
127118
VirtualMachine vmObj = vsphere.getVmByName(vm);
128119
if (vmObj == null)
129120
return FormValidation.error(Messages.validation_notFound("VM"));
130-
121+
131122
if (vmObj.getConfig().template)
132123
return FormValidation.error(Messages.validation_notActually("VM"));
133-
124+
134125
return FormValidation.ok(Messages.validation_success());
135126
} catch (Exception e) {
136127
throw new RuntimeException(e);

‎src/main/java/org/jenkinsci/plugins/vsphere/builders/Deploy.java‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -74,21 +74,9 @@ public String getResourcePool() {
7474
return resourcePool;
7575
}
7676

77-
@Override
78-
public boolean perform(final AbstractBuild<?, ?> build, final Launcher launcher, final BuildListener listener) {
79-
80-
PrintStream jLogger = listener.getLogger();
81-
boolean success=false;
82-
83-
try{
84-
success = deployFromTemplate(build, launcher, listener);
85-
}
86-
catch(VSphereException e){
87-
VSphereLogger.vsLogger(jLogger, e.getMessage());
88-
}
89-
77+
public boolean perform(final AbstractBuild<?, ?> build, final Launcher launcher, final BuildListener listener) throws VSphereException {
78+
return deployFromTemplate(build, launcher, listener);
9079
//TODO throw AbortException instead of returning value
91-
return success;
9280
}
9381

9482
private boolean deployFromTemplate(final AbstractBuild<?, ?> build, final Launcher launcher, final BuildListener listener) throws VSphereException {

‎src/main/java/org/jenkinsci/plugins/vsphere/builders/PowerOff.java‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,9 @@ public String getVm() {
5454
return vm;
5555
}
5656

57-
@Override
58-
public boolean perform(final AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener) {
59-
PrintStream jLogger = listener.getLogger();
60-
boolean success=false;
61-
62-
try{
63-
success = powerOff(build, launcher, listener);
64-
}
65-
catch(VSphereException e){
66-
VSphereLogger.vsLogger(jLogger, e.getMessage());
67-
}
68-
57+
public boolean perform(final AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener) throws VSphereException {
58+
return powerOff(build, launcher, listener);
6959
//TODO throw AbortException instead of returning value
70-
return success;
7160
}
7261

7362
private boolean powerOff(final AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener) throws VSphereException{
@@ -120,7 +109,7 @@ public FormValidation doTestData(@QueryParameter String serverName,
120109
VirtualMachine vmObj = vsphere.getVmByName(vm);
121110
if ( vmObj == null)
122111
return FormValidation.error(Messages.validation_notFound("VM"));
123-
112+
124113
if (vmObj.getConfig().template)
125114
return FormValidation.error(Messages.validation_notActually("VM"));
126115

‎src/main/java/org/jenkinsci/plugins/vsphere/builders/PowerOn.java‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -57,20 +57,9 @@ public int getTimeoutInSeconds() {
5757
return timeoutInSeconds;
5858
}
5959

60-
@Override
61-
public boolean perform(final AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener) {
62-
PrintStream jLogger = listener.getLogger();
63-
boolean success=false;
64-
65-
try{
66-
success = powerOn(build, launcher, listener);
67-
}
68-
catch(VSphereException e){
69-
VSphereLogger.vsLogger(jLogger, e.getMessage());
70-
}
71-
60+
public boolean perform(final AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener) throws VSphereException {
61+
return powerOn(build, launcher, listener);
7262
//TODO throw AbortException instead of returning value
73-
return success;
7463
}
7564

7665
private boolean powerOn(final AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener) throws VSphereException{
@@ -146,7 +135,7 @@ public FormValidation doTestData(@QueryParameter String serverName,
146135
VirtualMachine vmObj = vsphere.getVmByName(vm);
147136
if ( vmObj == null)
148137
return FormValidation.error(Messages.validation_notFound("VM"));
149-
138+
150139
if (vmObj.getConfig().template)
151140
return FormValidation.error(Messages.validation_notActually("VM"));
152141

‎src/main/java/org/jenkinsci/plugins/vsphere/builders/RevertToSnapshot.java‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,9 @@ public String getSnapshotName() {
5454
return snapshotName;
5555
}
5656

57-
@Override
58-
public boolean perform(final AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener) {
59-
PrintStream jLogger = listener.getLogger();
60-
boolean success=false;
61-
62-
try{
63-
success = revertToSnapshot(build, launcher, listener);
64-
}
65-
catch(VSphereException e){
66-
VSphereLogger.vsLogger(jLogger, e.getMessage());
67-
}
68-
57+
public boolean perform(final AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener) throws VSphereException {
58+
return revertToSnapshot(build, launcher, listener);
6959
//TODO throw AbortException instead of returning value
70-
return success;
7160
}
7261

7362
private boolean revertToSnapshot(final AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener) throws VSphereException{

‎src/main/java/org/jenkinsci/plugins/vsphere/builders/SuspendVm.java‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,9 @@ public String getVm() {
4646
return vm;
4747
}
4848

49-
@Override
50-
public boolean perform(final AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener) {
51-
PrintStream jLogger = listener.getLogger();
52-
boolean success=false;
53-
54-
try{
55-
success = suspend(build, launcher, listener);
56-
}
57-
catch(VSphereException e){
58-
VSphereLogger.vsLogger(jLogger, e.getMessage());
59-
}
60-
49+
public boolean perform(final AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener) throws VSphereException {
50+
return suspend(build, launcher, listener);
6151
//TODO throw AbortException instead of returning value
62-
return success;
6352
}
6453

6554
private boolean suspend(final AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener) throws VSphereException{

‎src/main/java/org/jenkinsci/plugins/vsphere/builders/TakeSnapshot.java‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -64,20 +64,9 @@ public boolean isIncludeMemory(){
6464
return includeMemory;
6565
}
6666

67-
@Override
68-
public boolean perform(final AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener) {
69-
PrintStream jLogger = listener.getLogger();
70-
boolean success=false;
71-
72-
try{
73-
success = takeSnapshot(build, launcher, listener);
74-
}
75-
catch(VSphereException e){
76-
VSphereLogger.vsLogger(jLogger, e.getMessage());
77-
}
78-
67+
public boolean perform(final AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener) throws VSphereException {
68+
return takeSnapshot(build, launcher, listener);
7969
//TODO throw AbortException instead of returning value
80-
return success;
8170
}
8271

8372
private boolean takeSnapshot(final AbstractBuild<?, ?> build, Launcher launcher, final BuildListener listener) throws VSphereException{

0 commit comments

Comments
 (0)