move monitor & exec wrapper to infra

kaltura · Dec 22, 2020 · 68d3c45 · 68d3c45
1 parent 0ee4bab
commit 68d3c45
Show file tree

Hide file tree

Showing 59 changed files with 4 additions and 4 deletions.
diff --git a/alpha/apps/kaltura/lib/cache/kApiCache.php b/alpha/apps/kaltura/lib/cache/kApiCache.php
@@ -8,7 +8,7 @@
 require_once(dirname(__FILE__) . '/../request/kIpAddressUtils.php');
 require_once(dirname(__FILE__) . '/../request/kGeoUtils.php');
 require_once(dirname(__FILE__) . '/../kGeoCoderManager.php');
-require_once(dirname(__FILE__) . '/../monitor/KalturaMonitorClient.php');
+require_once(dirname(__FILE__) . '/../../../../../infra/monitor/KalturaMonitorClient.php');
 
 /**
  * @package server-infra

diff --git a/alpha/web/index.php b/alpha/web/index.php
@@ -207,7 +207,7 @@ function checkCache()
 					}
 				}
 
-				require_once(dirname(__FILE__) . '/../apps/kaltura/lib/monitor/KalturaMonitorClient.php');
+				require_once(dirname(__FILE__) . '/../../infra/monitor/KalturaMonitorClient.php');
 				KalturaMonitorClient::monitorApiStart(true, 'extwidget.thumbnail', $renderer->partnerId);
 				header("X-Kaltura:cached-dispatcher-thumb");
 				$renderer->output();
@@ -238,8 +238,8 @@ function checkCache()
 	{
 		require_once(dirname(__FILE__) . '/../apps/kaltura/lib/renderers/kRendererDumpFile.php');
 		require_once(dirname(__FILE__) . '/../apps/kaltura/lib/renderers/kRendererString.php');
-		require_once(dirname(__FILE__) . '/../apps/kaltura/lib/monitor/KalturaMonitorClient.php');
 		require_once(dirname(__FILE__) . '/../apps/kaltura/lib/request/kIpAddressUtils.php');
+		require_once(dirname(__FILE__) . '/../../infra/monitor/KalturaMonitorClient.php');
 
 		$host = isset($_SERVER['HTTP_X_FORWARDED_HOST']) ? $_SERVER['HTTP_X_FORWARDED_HOST'] : $_SERVER['HTTP_HOST'];
 		$cacheKey = 'dumpFile-'.kIpAddressUtils::isInternalIp($_SERVER['REMOTE_ADDR']).'-'.$host.$uri;

diff --git a/alpha/apps/kaltura/lib/kExecWrapper.php → infra/general/kExecWrapper.php b/alpha/apps/kaltura/lib/kExecWrapper.php → infra/general/kExecWrapper.php
diff --git a/...tura/lib/monitor/KalturaMonitorClient.php → infra/monitor/KalturaMonitorClient.php b/...tura/lib/monitor/KalturaMonitorClient.php → infra/monitor/KalturaMonitorClient.php
diff --git a/...ltura/lib/monitor/KalturaMonitorServer.py → infra/monitor/KalturaMonitorServer.py b/...ltura/lib/monitor/KalturaMonitorServer.py → infra/monitor/KalturaMonitorServer.py
diff --git a/.../apps/kaltura/lib/monitor/apimonClient.py → infra/monitor/apimonClient.py b/.../apps/kaltura/lib/monitor/apimonClient.py → infra/monitor/apimonClient.py
diff --git a/.../apps/kaltura/lib/monitor/apimonServer.py → infra/monitor/apimonServer.py b/.../apps/kaltura/lib/monitor/apimonServer.py → infra/monitor/apimonServer.py
diff --git a/.../apps/kaltura/lib/monitor/testMonitor.php → infra/monitor/testMonitor.php b/.../apps/kaltura/lib/monitor/testMonitor.php → infra/monitor/testMonitor.php
diff --git a/...a/apps/kaltura/lib/monitor/web/index.html → infra/monitor/web/index.html b/...a/apps/kaltura/lib/monitor/web/index.html → infra/monitor/web/index.html
diff --git a/...ps/kaltura/lib/monitor/web/js/flot/API.md → infra/monitor/web/js/flot/API.md b/...ps/kaltura/lib/monitor/web/js/flot/API.md → infra/monitor/web/js/flot/API.md
diff --git a/...a/lib/monitor/web/js/flot/CONTRIBUTING.md → infra/monitor/web/js/flot/CONTRIBUTING.md b/...a/lib/monitor/web/js/flot/CONTRIBUTING.md → infra/monitor/web/js/flot/CONTRIBUTING.md
diff --git a/...ps/kaltura/lib/monitor/web/js/flot/FAQ.md → infra/monitor/web/js/flot/FAQ.md b/...ps/kaltura/lib/monitor/web/js/flot/FAQ.md → infra/monitor/web/js/flot/FAQ.md
diff --git a/...ltura/lib/monitor/web/js/flot/LICENSE.txt → infra/monitor/web/js/flot/LICENSE.txt b/...ltura/lib/monitor/web/js/flot/LICENSE.txt → infra/monitor/web/js/flot/LICENSE.txt
diff --git a/.../kaltura/lib/monitor/web/js/flot/Makefile → infra/monitor/web/js/flot/Makefile b/.../kaltura/lib/monitor/web/js/flot/Makefile → infra/monitor/web/js/flot/Makefile
diff --git a/...s/kaltura/lib/monitor/web/js/flot/NEWS.md → infra/monitor/web/js/flot/NEWS.md b/...s/kaltura/lib/monitor/web/js/flot/NEWS.md → infra/monitor/web/js/flot/NEWS.md
diff --git a/...altura/lib/monitor/web/js/flot/PLUGINS.md → infra/monitor/web/js/flot/PLUGINS.md b/...altura/lib/monitor/web/js/flot/PLUGINS.md → infra/monitor/web/js/flot/PLUGINS.md
diff --git a/...kaltura/lib/monitor/web/js/flot/README.md → infra/monitor/web/js/flot/README.md b/...kaltura/lib/monitor/web/js/flot/README.md → infra/monitor/web/js/flot/README.md
diff --git a/...ltura/lib/monitor/web/js/flot/excanvas.js → infra/monitor/web/js/flot/excanvas.js b/...ltura/lib/monitor/web/js/flot/excanvas.js → infra/monitor/web/js/flot/excanvas.js
diff --git a/...a/lib/monitor/web/js/flot/excanvas.min.js → infra/monitor/web/js/flot/excanvas.min.js b/...a/lib/monitor/web/js/flot/excanvas.min.js → infra/monitor/web/js/flot/excanvas.min.js
diff --git a/...onitor/web/js/flot/jquery.colorhelpers.js → ...onitor/web/js/flot/jquery.colorhelpers.js b/...onitor/web/js/flot/jquery.colorhelpers.js → ...onitor/web/js/flot/jquery.colorhelpers.js
diff --git a/...or/web/js/flot/jquery.colorhelpers.min.js → ...or/web/js/flot/jquery.colorhelpers.min.js b/...or/web/js/flot/jquery.colorhelpers.min.js → ...or/web/js/flot/jquery.colorhelpers.min.js
diff --git a/...monitor/web/js/flot/jquery.flot.canvas.js → ...monitor/web/js/flot/jquery.flot.canvas.js b/...monitor/web/js/flot/jquery.flot.canvas.js → ...monitor/web/js/flot/jquery.flot.canvas.js
diff --git a/...tor/web/js/flot/jquery.flot.canvas.min.js → ...tor/web/js/flot/jquery.flot.canvas.min.js b/...tor/web/js/flot/jquery.flot.canvas.min.js → ...tor/web/js/flot/jquery.flot.canvas.min.js
diff --git a/...tor/web/js/flot/jquery.flot.categories.js → ...tor/web/js/flot/jquery.flot.categories.js b/...tor/web/js/flot/jquery.flot.categories.js → ...tor/web/js/flot/jquery.flot.categories.js
diff --git a/...web/js/flot/jquery.flot.categories.min.js → ...web/js/flot/jquery.flot.categories.min.js b/...web/js/flot/jquery.flot.categories.min.js → ...web/js/flot/jquery.flot.categories.min.js
diff --git a/...itor/web/js/flot/jquery.flot.crosshair.js → ...itor/web/js/flot/jquery.flot.crosshair.js b/...itor/web/js/flot/jquery.flot.crosshair.js → ...itor/web/js/flot/jquery.flot.crosshair.js
diff --git a/.../web/js/flot/jquery.flot.crosshair.min.js → .../web/js/flot/jquery.flot.crosshair.min.js b/.../web/js/flot/jquery.flot.crosshair.min.js → .../web/js/flot/jquery.flot.crosshair.min.js
diff --git a/...itor/web/js/flot/jquery.flot.errorbars.js → ...itor/web/js/flot/jquery.flot.errorbars.js b/...itor/web/js/flot/jquery.flot.errorbars.js → ...itor/web/js/flot/jquery.flot.errorbars.js
diff --git a/.../web/js/flot/jquery.flot.errorbars.min.js → .../web/js/flot/jquery.flot.errorbars.min.js b/.../web/js/flot/jquery.flot.errorbars.min.js → .../web/js/flot/jquery.flot.errorbars.min.js
diff --git a/...or/web/js/flot/jquery.flot.fillbetween.js → ...or/web/js/flot/jquery.flot.fillbetween.js b/...or/web/js/flot/jquery.flot.fillbetween.js → ...or/web/js/flot/jquery.flot.fillbetween.js
diff --git a/...eb/js/flot/jquery.flot.fillbetween.min.js → ...eb/js/flot/jquery.flot.fillbetween.min.js b/...eb/js/flot/jquery.flot.fillbetween.min.js → ...eb/js/flot/jquery.flot.fillbetween.min.js
diff --git a/.../monitor/web/js/flot/jquery.flot.image.js → .../monitor/web/js/flot/jquery.flot.image.js b/.../monitor/web/js/flot/jquery.flot.image.js → .../monitor/web/js/flot/jquery.flot.image.js
diff --git a/...itor/web/js/flot/jquery.flot.image.min.js → ...itor/web/js/flot/jquery.flot.image.min.js b/...itor/web/js/flot/jquery.flot.image.min.js → ...itor/web/js/flot/jquery.flot.image.min.js
diff --git a/...ra/lib/monitor/web/js/flot/jquery.flot.js → infra/monitor/web/js/flot/jquery.flot.js b/...ra/lib/monitor/web/js/flot/jquery.flot.js → infra/monitor/web/js/flot/jquery.flot.js
diff --git a/...ib/monitor/web/js/flot/jquery.flot.min.js → infra/monitor/web/js/flot/jquery.flot.min.js b/...ib/monitor/web/js/flot/jquery.flot.min.js → infra/monitor/web/js/flot/jquery.flot.min.js
diff --git a/...nitor/web/js/flot/jquery.flot.navigate.js → ...nitor/web/js/flot/jquery.flot.navigate.js b/...nitor/web/js/flot/jquery.flot.navigate.js → ...nitor/web/js/flot/jquery.flot.navigate.js
diff --git a/...r/web/js/flot/jquery.flot.navigate.min.js → ...r/web/js/flot/jquery.flot.navigate.min.js b/...r/web/js/flot/jquery.flot.navigate.min.js → ...r/web/js/flot/jquery.flot.navigate.min.js
diff --git a/...ib/monitor/web/js/flot/jquery.flot.pie.js → infra/monitor/web/js/flot/jquery.flot.pie.js b/...ib/monitor/web/js/flot/jquery.flot.pie.js → infra/monitor/web/js/flot/jquery.flot.pie.js
diff --git a/...onitor/web/js/flot/jquery.flot.pie.min.js → ...onitor/web/js/flot/jquery.flot.pie.min.js b/...onitor/web/js/flot/jquery.flot.pie.min.js → ...onitor/web/js/flot/jquery.flot.pie.min.js
diff --git a/...monitor/web/js/flot/jquery.flot.resize.js → ...monitor/web/js/flot/jquery.flot.resize.js b/...monitor/web/js/flot/jquery.flot.resize.js → ...monitor/web/js/flot/jquery.flot.resize.js
diff --git a/...tor/web/js/flot/jquery.flot.resize.min.js → ...tor/web/js/flot/jquery.flot.resize.min.js b/...tor/web/js/flot/jquery.flot.resize.min.js → ...tor/web/js/flot/jquery.flot.resize.min.js
diff --git a/...itor/web/js/flot/jquery.flot.selection.js → ...itor/web/js/flot/jquery.flot.selection.js b/...itor/web/js/flot/jquery.flot.selection.js → ...itor/web/js/flot/jquery.flot.selection.js
diff --git a/.../web/js/flot/jquery.flot.selection.min.js → .../web/js/flot/jquery.flot.selection.min.js b/.../web/js/flot/jquery.flot.selection.min.js → .../web/js/flot/jquery.flot.selection.min.js
diff --git a/.../monitor/web/js/flot/jquery.flot.stack.js → .../monitor/web/js/flot/jquery.flot.stack.js b/.../monitor/web/js/flot/jquery.flot.stack.js → .../monitor/web/js/flot/jquery.flot.stack.js
diff --git a/...itor/web/js/flot/jquery.flot.stack.min.js → ...itor/web/js/flot/jquery.flot.stack.min.js b/...itor/web/js/flot/jquery.flot.stack.min.js → ...itor/web/js/flot/jquery.flot.stack.min.js
diff --git a/...monitor/web/js/flot/jquery.flot.symbol.js → ...monitor/web/js/flot/jquery.flot.symbol.js b/...monitor/web/js/flot/jquery.flot.symbol.js → ...monitor/web/js/flot/jquery.flot.symbol.js
diff --git a/...tor/web/js/flot/jquery.flot.symbol.min.js → ...tor/web/js/flot/jquery.flot.symbol.min.js b/...tor/web/js/flot/jquery.flot.symbol.min.js → ...tor/web/js/flot/jquery.flot.symbol.min.js
diff --git a/...itor/web/js/flot/jquery.flot.threshold.js → ...itor/web/js/flot/jquery.flot.threshold.js b/...itor/web/js/flot/jquery.flot.threshold.js → ...itor/web/js/flot/jquery.flot.threshold.js
diff --git a/.../web/js/flot/jquery.flot.threshold.min.js → .../web/js/flot/jquery.flot.threshold.min.js b/.../web/js/flot/jquery.flot.threshold.min.js → .../web/js/flot/jquery.flot.threshold.min.js
diff --git a/...b/monitor/web/js/flot/jquery.flot.time.js → ...a/monitor/web/js/flot/jquery.flot.time.js b/...b/monitor/web/js/flot/jquery.flot.time.js → ...a/monitor/web/js/flot/jquery.flot.time.js
diff --git a/...nitor/web/js/flot/jquery.flot.time.min.js → ...nitor/web/js/flot/jquery.flot.time.min.js b/...nitor/web/js/flot/jquery.flot.time.min.js → ...nitor/web/js/flot/jquery.flot.time.min.js
diff --git a/...kaltura/lib/monitor/web/js/flot/jquery.js → infra/monitor/web/js/flot/jquery.js b/...kaltura/lib/monitor/web/js/flot/jquery.js → infra/monitor/web/js/flot/jquery.js
diff --git a/...ura/lib/monitor/web/js/flot/jquery.min.js → infra/monitor/web/js/flot/jquery.min.js b/...ura/lib/monitor/web/js/flot/jquery.min.js → infra/monitor/web/js/flot/jquery.min.js
diff --git a/...altura/lib/monitor/web/js/jquery-1.8.3.js → infra/monitor/web/js/jquery-1.8.3.js b/...altura/lib/monitor/web/js/jquery-1.8.3.js → infra/monitor/web/js/jquery-1.8.3.js
diff --git a/...onitor/web/js/socket.io/WebSocketMain.swf → ...onitor/web/js/socket.io/WebSocketMain.swf b/...onitor/web/js/socket.io/WebSocketMain.swf → ...onitor/web/js/socket.io/WebSocketMain.swf
diff --git a/...eb/js/socket.io/WebSocketMainInsecure.swf → ...eb/js/socket.io/WebSocketMainInsecure.swf b/...eb/js/socket.io/WebSocketMainInsecure.swf → ...eb/js/socket.io/WebSocketMainInsecure.swf
diff --git a/...lib/monitor/web/js/socket.io/socket.io.js → infra/monitor/web/js/socket.io/socket.io.js b/...lib/monitor/web/js/socket.io/socket.io.js → infra/monitor/web/js/socket.io/socket.io.js
diff --git a/...monitor/web/js/socket.io/socket.io.min.js → ...monitor/web/js/socket.io/socket.io.min.js b/...monitor/web/js/socket.io/socket.io.min.js → ...monitor/web/js/socket.io/socket.io.min.js
diff --git a/plugins/beacon/lib/model/kBeaconCacheLayerActions.php b/plugins/beacon/lib/model/kBeaconCacheLayerActions.php
@@ -16,7 +16,7 @@
 require_once (dirname(__FILE__) . '/../../../../plugins/queue/providers/rabbit_mq/lib/RabbitMQProvider.php');
 require_once (dirname(__FILE__) . '/../../../../plugins/queue/providers/rabbit_mq/lib/MultiCentersRabbitMQProvider.php');
 
-require_once (dirname(__FILE__) . '/../../../../alpha/apps/kaltura/lib/monitor/KalturaMonitorClient.php');
+require_once (dirname(__FILE__) . '/../../../../infra/monitor/KalturaMonitorClient.php');
 
 
 class kBeaconCacheLayerActions