Merge pull request #4869 from ant-media/serverAlerts

High resource usage and server unexpected shutdown webhook

Author: mekya

src/main/java/io/antmedia/AntMediaApplicationAdapter.java

@@ -8,19 +8,14 @@
 import java.lang.reflect.Modifier;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.regex.Pattern;
-import java.util.Queue;
-import java.util.Set;
 
 import javax.validation.constraints.NotNull;
 
+import io.antmedia.statistic.*;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.RandomStringUtils;
@@ -72,9 +67,6 @@
 import io.antmedia.settings.ServerSettings;
 import io.antmedia.shutdown.AMSShutdownManager;
 import io.antmedia.shutdown.IShutdownListener;
-import io.antmedia.statistic.DashViewerStats;
-import io.antmedia.statistic.HlsViewerStats;
-import io.antmedia.statistic.ViewerStats;
 import io.antmedia.statistic.type.RTMPToWebRTCStats;
 import io.antmedia.statistic.type.WebRTCAudioReceiveStats;
 import io.antmedia.statistic.type.WebRTCAudioSendStats;
@@ -97,6 +89,7 @@ public class AntMediaApplicationAdapter  extends MultiThreadedApplicationAdapter
 	public static final String HOOK_ACTION_END_LIVE_STREAM = "liveStreamEnded";
 	public static final String HOOK_ACTION_START_LIVE_STREAM = "liveStreamStarted";
 	public static final String HOOK_ACTION_VOD_READY = "vodReady";
+
 	public static final String HOOK_ACTION_PUBLISH_TIMEOUT_ERROR = "publishTimeoutError";
 	public static final String HOOK_ACTION_ENCODER_NOT_OPENED_ERROR =  "encoderNotOpenedError";
 	public static final String HOOK_ACTION_ENDPOINT_FAILED = "endpointFailed";
@@ -151,7 +144,7 @@ public class AntMediaApplicationAdapter  extends MultiThreadedApplicationAdapter
 
 	protected StorageClient storageClient;
 
-	protected ArrayList<IStreamListener> streamListeners = new ArrayList<>();
+	protected Queue<IStreamListener> streamListeners = new ConcurrentLinkedQueue<>();
 
 	IClusterStreamFetcher clusterStreamFetcher;
 
@@ -176,6 +169,7 @@ public boolean appStart(IScope app) {
 		if (!result.isSuccess()) {
 			//Save App Setting
 			this.shutdownProperly = false;
+
 			// Reset Broadcast Stats
 			resetBroadcasts();
 		}
@@ -241,7 +235,6 @@ else if (getServerSettings().getHostAddress().equals(storedSettings.getWarFileOr
 
 		setStorageclientSettings(appSettings);
 
-
 		logger.info("{} started", app.getName());
 
 		return true;
@@ -357,7 +350,6 @@ public Result importVoDFolder(String vodFolderPath) {
 		return result;
 	}
 
-
 	public Result unlinksVoD(String directory) 
 	{
 		//check the directory exist

src/main/java/io/antmedia/console/rest/RestServiceV2.java

@@ -461,7 +461,7 @@ public Response isShutdownProperly(@ApiParam(value = "Application name", require
 		return super.isShutdownProperly(appNamesArray);
 	}
 
-	@ApiOperation(value = "Set application or applications shutdown properly to true", response = Result.class)
+	@ApiOperation(value = "Set application or applications shutdown property to true", response = Result.class)
 	@GET
 	@Path("/shutdown-properly")
 	@Produces(MediaType.APPLICATION_JSON)

src/main/java/io/antmedia/settings/ServerSettings.java

@@ -87,6 +87,8 @@ public class ServerSettings implements ApplicationContextAware {
 	public static final String SETTINGS_JWT_SERVER_CONTROL_ENABLED = "server.jwtServerControlEnabled";
 
 	public static final String SETTINGS_JWKS_URL = "server.jwksURL";
+
+	private static final String SETTINGS_SERVER_STATUS_WEBHOOK_URL = "server.statusWebHookURL";
 
 	/**
 	 * The IP filter that is allowed to access the web panel of Ant Media Server
@@ -235,6 +237,15 @@ public class ServerSettings implements ApplicationContextAware {
 	@Value("${"+SETTINGS_RTMP_PORT + ":1935}")
 	private int rtmpPort = 1935;
 
+	
+	/**
+	 * Server status webhook url. It's called for several errors such 
+	 * - high resource usage
+	 * - Unexpected shutdown
+	 */
+	@Value("${"+SETTINGS_SERVER_STATUS_WEBHOOK_URL + ":#{null}}")
+	private String serverStatusWebHookURL;
+
 
 	public String getJwksURL() {
 		return jwksURL;
@@ -565,5 +576,13 @@ public void setSslEnabled(boolean sslEnabled) {
 		this.sslEnabled = sslEnabled;
 	}
 
+	public String getServerStatusWebHookURL() {
+		return serverStatusWebHookURL;
+	}
+
+	
+	public void setServerStatusWebHookURL(String serverStatusWebHookURL) {
+		this.serverStatusWebHookURL = serverStatusWebHookURL;
+	}
 
 }