This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new f56989f Fix issues with statuses
f56989f is described below
commit f56989ffc521e7bf8c55d4620d5f0dfe4cc2b92a
Author: Marat Gubaidullin <marat.gubaidul...@gmail.com>
AuthorDate: Tue Sep 20 10:47:22 2022 -0400
Fix issues with statuses
---
.../camel/karavan/service/KubernetesService.java | 2 ++
.../camel/karavan/service/StatusService.java | 22 +++++++---------------
karavan-app/src/main/webapp/src/api/KaravanApi.tsx | 2 +-
.../src/main/webapp/src/projects/ProjectInfo.tsx | 2 +-
4 files changed, 11 insertions(+), 17 deletions(-)
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/service/KubernetesService.java
b/karavan-app/src/main/java/org/apache/camel/karavan/service/KubernetesService.java
index 190aab4..9862846 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/service/KubernetesService.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/service/KubernetesService.java
@@ -173,6 +173,7 @@ public class KubernetesService {
public void deleteDeployment(String name, String namespace) {
try {
+ LOGGER.info("Delete deployment: " + name + " in the namespace: " +
namespace);
kubernetesClient().apps().deployments().inNamespace(namespace).withName(name).delete();
} catch (Exception ex) {
LOGGER.error(ex.getMessage());
@@ -181,6 +182,7 @@ public class KubernetesService {
public void deletePod(String name, String namespace) {
try {
+ LOGGER.info("Delete pod: " + name + " in the namespace: " +
namespace);
kubernetesClient().pods().inNamespace(namespace).withName(name).delete();
} catch (Exception ex) {
LOGGER.error(ex.getMessage());
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/service/StatusService.java
b/karavan-app/src/main/java/org/apache/camel/karavan/service/StatusService.java
index d3bd6a2..a947236 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/service/StatusService.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/service/StatusService.java
@@ -78,7 +78,6 @@ public class StatusService {
Optional<KaravanConfiguration.Environment> env =
configuration.environments().stream().filter(environment ->
environment.name().equals("dev")).findFirst();
if (env.isPresent()) {
boolean hasDeployment =
kubernetesService.hasDeployment(project.getProjectId(), env.get().namespace());
- System.out.println("Project " + project.getName() + "
deployed: " + project.getDeployed() + " hasDeployment: " + hasDeployment);
if (!project.getDeployed() && hasDeployment) {
project.setDeployed(true);
infinispanService.saveProject(project);
@@ -91,21 +90,14 @@ public class StatusService {
});
}
- @Scheduled(every="3s")
- void collectStatuses() {
- LOGGER.info("Check deployed project statuses");
- infinispanService.getProjects().forEach(project -> {
- collectStatusesForProject(project.getProjectId());
- });
- }
-// @ConsumeEvent(value = CMD_COLLECT_STATUSES, blocking = true, ordered =
true)
-// public void collectStatuses(String projectId) throws Exception {
-// if ((System.currentTimeMillis() - lastCollect) >
configuration.statusThreshold()) {
-// collectStatusesForProject(projectId);
-// lastCollect = System.currentTimeMillis();
-// }
-// }
+ @ConsumeEvent(value = CMD_COLLECT_STATUSES, blocking = true, ordered =
true)
+ public void collectStatuses(String projectId) throws Exception {
+ if ((System.currentTimeMillis() - lastCollect) >
configuration.statusThreshold()) {
+ collectStatusesForProject(projectId);
+ lastCollect = System.currentTimeMillis();
+ }
+ }
private void collectStatusesForProject(String projectId) {
ProjectStatus old = infinispanService.getProjectStatus(projectId);
diff --git a/karavan-app/src/main/webapp/src/api/KaravanApi.tsx
b/karavan-app/src/main/webapp/src/api/KaravanApi.tsx
index ef4c0d8..78a3bde 100644
--- a/karavan-app/src/main/webapp/src/api/KaravanApi.tsx
+++ b/karavan-app/src/main/webapp/src/api/KaravanApi.tsx
@@ -62,7 +62,7 @@ export class KaravanApi {
const originalRequest = error.config;
if ((error?.response?.status === 403 || error?.response?.status
=== 401) && !originalRequest._retry) {
console.log("error", error)
- return SsoApi.keycloak?.updateToken(1).then(refreshed => {
+ return SsoApi.keycloak?.updateToken(30).then(refreshed => {
if (refreshed) {
console.log('SsoApi', 'Token was successfully
refreshed', SsoApi.keycloak?.token);
} else {
diff --git a/karavan-app/src/main/webapp/src/projects/ProjectInfo.tsx
b/karavan-app/src/main/webapp/src/projects/ProjectInfo.tsx
index b2bec98..bcde2e0 100644
--- a/karavan-app/src/main/webapp/src/projects/ProjectInfo.tsx
+++ b/karavan-app/src/main/webapp/src/projects/ProjectInfo.tsx
@@ -59,7 +59,7 @@ export class ProjectInfo extends React.Component<Props,
State> {
componentDidMount() {
this.onRefresh();
- this.interval = setInterval(() => this.onRefreshStatus(), 1300);
+ this.interval = setInterval(() => this.onRefreshStatus(), 700);
}
componentWillUnmount() {
