SpringCloud/spring-cloud-function
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-638 Enhance the lifecycle of function deployemnt in s-c-f-deployer

Browse Source 
Resolves #638
This commit is contained in:
Oleg Zhurakousky
2021-02-01 13:34:59 +01:00
parent d9d1588a19
commit 5b51b3397d
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionDeployerConfiguration.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2019-2019 the original author or authors. * Copyright 2019-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -67,7 +67,7 @@ public class FunctionDeployerConfiguration {
private static Log logger = LogFactory.getLog(FunctionDeployerConfiguration.class); private static Log logger = LogFactory.getLog(FunctionDeployerConfiguration.class);
@Bean @Bean
SmartLifecycle functionArchiveDeployer(FunctionDeployerProperties functionProperties, SmartLifecycle functionArchiveUnDeployer(FunctionDeployerProperties functionProperties,
FunctionRegistry functionRegistry, ApplicationArguments arguments, @Nullable MavenProperties mavenProperties) { FunctionRegistry functionRegistry, ApplicationArguments arguments, @Nullable MavenProperties mavenProperties) {
ApplicationArguments updatedArguments = this.updateArguments(arguments); ApplicationArguments updatedArguments = this.updateArguments(arguments);
@@ -100,9 +100,17 @@ public class FunctionDeployerConfiguration {
} }
FunctionArchiveDeployer deployer = new FunctionArchiveDeployer(archive); FunctionArchiveDeployer deployer = new FunctionArchiveDeployer(archive);
if (logger.isInfoEnabled()) {
logger.info("Deploying archive: " + functionProperties.getLocation());
}
deployer.deploy(functionRegistry, functionProperties, updatedArguments.getSourceArgs());
if (logger.isInfoEnabled()) {
logger.info("Successfully deployed archive: " + functionProperties.getLocation());
}
return new SmartLifecycle() { return new SmartLifecycle() {
private boolean running; private boolean running = true;
@Override @Override
public void stop() { public void stop() {
@@ -118,14 +126,7 @@ public class FunctionDeployerConfiguration {
@Override @Override
public void start() { public void start() {
if (logger.isInfoEnabled()) { // no op
logger.info("Deploying archive: " + functionProperties.getLocation());
}
deployer.deploy(functionRegistry, functionProperties, updatedArguments.getSourceArgs());
this.running = true;
if (logger.isInfoEnabled()) {
logger.info("Successfully deployed archive: " + functionProperties.getLocation());
}
} }
@Override @Override