From 555358a851fed6116d490e9ff1720a1205050b83 Mon Sep 17 00:00:00 2001
From: Lulzette <ivan@lulzette.ru>
Date: Thu, 13 Jan 2022 13:49:13 +0000
Subject: [PATCH] More OOB actions

---
 src/basic.sh | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/basic.sh b/src/basic.sh
index 04a1a6b..0c66979 100644
--- a/src/basic.sh
+++ b/src/basic.sh
@@ -53,20 +53,25 @@ echo -e "\n${TEXT_COLOR_GOOD} - Installed panel: ${TEXT_COLOR_OFF}\n"
 [[ -d /usr/local/mgr5/ ]] && echo "ISPManager!"
 [[ -d /usr/local/fastpanel2 ]] && echo "Fastpanel 2"
 
-echo -e "${TEXT_COLOR_GOOD} - Installed packages: ${TEXT_COLOR_OFF}\n"
+echo -e "${TEXT_COLOR_GOOD} - OOMS: ${TEXT_COLOR_OFF}\n"
+dmesg -T | grep "Out of memory" | tail -20
 
-list=$(apt list --installed 2>&1 |egrep 'atop')
+echo -e "${TEXT_COLOR_GOOD} - Top RAM usage:${TEXT_COLOR_OFF}"
+
+ps axk-%mem ouser,%cpu,%mem,command | head
+echo
+echo -e "${TEXT_COLOR_GOOD} - Top CPU usage:${TEXT_COLOR_OFF}"
+
+ps axk-%cpu ouser,%cpu,%mem,command | head
 
-echo $list
 
 while true
 do
 echo -e "
 ---
-1. Посмотреть жрущие ЦПУ/ОЗУ процессы 
-2. Вывести OOM'ы
-3. nginx: Посмотреть конфиги и домены в них
-4. Запустить logs
+1. Есть ли atop?
+2. nginx: Посмотреть конфиги и домены в них
+3. Запустить logs
 
 0. Выход 
 "
@@ -77,22 +82,15 @@ echo -e "
       harakiri
       ;;
     1) 
-      echo -e "${TEXT_COLOR_GOOD}- Top RAM usage:${TEXT_COLOR_OFF}"
-      
-      ps axk-%mem ouser,%cpu,%mem,command | head
-      echo
-      echo -e "${TEXT_COLOR_GOOD}- Top CPU usage:${TEXT_COLOR_OFF}"
-      
-      ps axk-%cpu ouser,%cpu,%mem,command | head
+      echo -e "${TEXT_COLOR_GOOD} - Installed packages: ${TEXT_COLOR_OFF}\n"
+      list=$(apt list --installed 2>&1 |egrep 'atop')
+      echo $list
+
       ;;
     2) 
-      echo "- OOMS:"
-      dmesg -T | grep "Out of memory"
-      ;;
-    3) 
       nginx -T 2> /dev/null | egrep "configuration file|server_name"
       ;;
-    4)
+    3)
       wget -O /tmp/nginx.sh 94.228.126.204/nginx.sh
       bash /tmp/nginx.sh
       rm /tmp/nginx.sh