add Health Check uri to liveness and readiness probes

dreab8 · Mar 28, 2018 · e8bb010 · e8bb010
1 parent 14058b7
commit e8bb010
Show file tree

Hide file tree

Showing 7 changed files with 81 additions and 21 deletions.
diff --git a/...nt-service/src/main/java/org/hibernate/demo/message/account/core/service/HealthCheck.java b/...nt-service/src/main/java/org/hibernate/demo/message/account/core/service/HealthCheck.java
@@ -0,0 +1,34 @@
+package org.hibernate.demo.message.account.core.service;
+
+import java.util.List;
+import javax.ejb.Stateless;
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.hibernate.demo.message.account.core.entity.User;
+import org.hibernate.demo.message.account.core.repo.UserRepo;
+
+import org.slf4j.Logger;
+
+@Path("/health")
+@Stateless
+public class HealthCheck {
+
+	@Inject
+	private Logger log;
+
+	@Inject
+	private UserRepo repo;
+
+	@GET
+	@Produces(MediaType.APPLICATION_JSON)
+	public List<User> healthCheck() {
+		log.info( "healthCheck invoked by OCP" );
+
+		return repo.findAll();
+	}
+
+}
diff --git a/...nt-service/src/main/java/org/hibernate/demo/message/account/core/service/UserService.java b/...nt-service/src/main/java/org/hibernate/demo/message/account/core/service/UserService.java
@@ -13,8 +13,8 @@
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 
 import org.hibernate.demo.message.account.core.entity.User;
@@ -37,9 +37,8 @@ public List<User> findAllUsers() {
 	}
 
 	@GET
-	@Path( "{username}" )
 	@Produces(MediaType.APPLICATION_JSON)
-	public User findByUsername(@PathParam("username") String username) {
+	public User findByUsername(@QueryParam("username") String username) {
 		return repo.findByUserName( username );
 	}
 

diff --git a/other/openshift/message-board/message-board-web/src/app/login.service.ts b/other/openshift/message-board/message-board-web/src/app/login.service.ts
@@ -22,7 +22,7 @@ export class LoginService {
   }
 
   login(userName: String): Observable<User> {
-    const url = `http://web-message-board.192.168.42.57.nip.io//users/?username=${userName}`;
+    const url = `account-service/user?username=${userName}`;
     console.log(url);
     return this.http.get<User>(url).map(
       user => {

diff --git a/other/openshift/message-board/message-board-web/src/app/message/message.component.html b/other/openshift/message-board/message-board-web/src/app/message/message.component.html
@@ -5,10 +5,11 @@
 				<a *ngFor="let user of users"
 					routerLink="/message/{{user.userName}}" (click)="onSelect(user)"
 					[class.text-danger]="user.userName === userName"
-					[class.text-info]="user.userName != userName"> <span
-					class="badge" [class.badge-danger]="user.userName === userName"
-					[class.badge-info]="user.userName != userName">{{ user.id }}</span>
-					{{ user.userName }}
+					[class.text-info]="user.userName != userName">
+          <div>
+            <span class="badge" [class.badge-danger]="user.userName === userName" [class.badge-info]="user.userName != userName">{{ user.id }}</span>
+            {{ user.userName }}
+          </div>
 				</a>
 			</div>
 		</div>

diff --git a/...ssage-service/src/main/java/org/hibernate/demo/message/post/core/service/HealthCheck.java b/...ssage-service/src/main/java/org/hibernate/demo/message/post/core/service/HealthCheck.java
@@ -0,0 +1,33 @@
+package org.hibernate.demo.message.post.core.service;
+
+import java.util.List;
+import javax.ejb.Stateless;
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.hibernate.demo.message.post.core.entity.Message;
+
+import org.slf4j.Logger;
+
+@Path("/health")
+@Stateless
+public class HealthCheck {
+
+	@Inject
+	private Logger log;
+
+	@Inject
+	private MessageService service;
+
+	@GET
+	@Produces(MediaType.APPLICATION_JSON)
+	public List<Message> healthCheck() {
+		log.info( "healthCheck invoked by OCP" );
+
+		return service.findMessagesByUser( "andrea" );
+	}
+
+}
diff --git a/...ge-service/src/main/java/org/hibernate/demo/message/post/core/service/MessageService.java b/...ge-service/src/main/java/org/hibernate/demo/message/post/core/service/MessageService.java
@@ -40,13 +40,6 @@ public class MessageService {
 	@Inject
 	private Logger log;
 
-	@GET
-	@Path( "{username}" )
-	@Produces( MediaType.APPLICATION_JSON )
-	public List<Message> findMessagesUser( @PathParam( "username" ) String username ) {
-		return findMessagesByUser( username );
-	}
-
 	@GET
 	@Produces( MediaType.APPLICATION_JSON )
 	public List<Message> findMessagesByUser( @QueryParam( "username" ) String username ) {

diff --git a/other/openshift/message-board/script/install-all.sh b/other/openshift/message-board/script/install-all.sh
@@ -34,13 +34,13 @@ oc new-app --image-stream=eap71-openshift:latest~./nocontent -e OPENSHIFT_KUBE_P
 oc start-build message-service --from-dir=./message-service --follow
 
 # Setting liveness probes
-oc set probe dc/account-service --liveness --failure-threshold 3 --initial-delay-seconds 30 --get-url=http://:8080/account-service/user
-oc set probe dc/message-service --liveness --failure-threshold 3 --initial-delay-seconds 30 --get-url=http://:8080/message-service/messages/fabio
-oc set probe dc/message-board-web --liveness --failure-threshold 3 --initial-delay-seconds 30 --get-url=http://:8080/
+oc set probe dc/account-service --liveness --failure-threshold 3 --initial-delay-seconds 30 --get-url=http://:8080/account-service/health
+oc set probe dc/message-service --liveness --failure-threshold 3 --initial-delay-seconds 30 --get-url=http://:8080/message-service/health
+#oc set probe dc/message-board-web --liveness --failure-threshold 3 --initial-delay-seconds 30 --get-url=http://:8080/
 
 # Setting readiness probes
-oc set probe dc/account-service --readiness --failure-threshold 3 --initial-delay-seconds 30 --get-url=http://:8080/account-service/user
-oc set probe dc/message-service --readiness --failure-threshold 3 --initial-delay-seconds 30 --get-url=http://:8080/message-service/messages/fabio
-oc set probe dc/message-board-web --readiness --failure-threshold 3 --initial-delay-seconds 30 --get-url=http://:8080/
+oc set probe dc/account-service --readiness --failure-threshold 3 --initial-delay-seconds 30 --get-url=http://:8080/account-service/health
+oc set probe dc/message-service --readiness --failure-threshold 3 --initial-delay-seconds 30 --get-url=http://:8080/message-service/health
+#oc set probe dc/message-board-web --readiness --failure-threshold 3 --initial-delay-seconds 30 --get-url=http://:8080/
 
 oc get pods -w