Skip to content

Commit c1f5600

Browse files
usmannasirusmannasir
committed
bug fix: topProcessesStatus
1 parent 874720f commit c1f5600

9 files changed

Lines changed: 181 additions & 53 deletions

File tree

‎serverStatus/static/serverStatus/serverStatus.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -812,6 +812,8 @@ app.controller('listOSPackages', function ($scope, $http, $timeout) {
812812
if (response.data.status === 1) {
813813
$scope.allPackages = JSON.parse(response.data.packages);
814814
$scope.pagination = response.data.pagination;
815+
$scope.fetchedPackages = response.data.fetchedPackages;
816+
$scope.totalPackages = response.data.totalPackages;
815817
} else {
816818
new PNotify({
817819
title: 'Error!',

‎serverStatus/templates/serverStatus/packageManager.html‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ <h2>{% trans "Package Manager" %}</h2>
3333
<p>Howdy, I'm in Section 4.</p>
3434
</div>
3535
<div class="tab-pane" id="tab6">
36+
<a style="float: left ; margin-bottom: 2%"
37+
class="btn btn-border btn-alt border-azure btn-link font-azure" href="#"
38+
title=""><span>Total Packages: {$ totalPackages $}</span></a>
39+
<a style="float: left; margin-bottom: 2%; margin-left: 2%"
40+
class="btn btn-border btn-alt border-blue-alt btn-link font-blue-alt" href="#"
41+
title=""><span>Fetched Packages: {$ fetchedPackages $}</span></a>
3642
<div class="col-sm-10"
3743
style="padding: 0px; box-shadow: 0px 0px 1px 0px #888888; margin-bottom: 2%">
3844
<input placeholder="Search..."
@@ -46,6 +52,7 @@ <h2>{% trans "Package Manager" %}</h2>
4652
<option>10</option>
4753
<option>50</option>
4854
<option>100</option>
55+
<option>500</option>
4956
</select>
5057
</div>
5158
</div>

‎serverStatus/views.py‎

Lines changed: 37 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -579,17 +579,45 @@ def topProcessesStatus(request):
579579
data['Softirqs'] = loadNow[13] + '%'
580580

581581
## Memory
582-
data['totalMemory'] = str(int(float(memory[3]) / 1024)) + 'MB'
583-
data['freeMemory'] = str(int(float(memory[5]) / 1024)) + 'MB'
584-
data['usedMemory'] = str(int(float(memory[7]) / 1024)) + 'MB'
585-
data['buffCache'] = str(int(float(memory[9]) / 1024)) + 'MB'
582+
583+
if memory[3].find('+') > -1:
584+
memoryFinal = memory[3].split('+')[0]
585+
else:
586+
memoryFinal = memory[3]
587+
588+
data['totalMemory'] = str(int(float(memoryFinal) / 1024)) + 'MB'
589+
590+
##
591+
592+
if memory[5].find('free') > -1:
593+
data['freeMemory'] = str(int(float(memory[4]) / 1024)) + 'MB'
594+
else:
595+
data['freeMemory'] = str(int(float(memory[5]) / 1024)) + 'MB'
596+
597+
##
598+
599+
if memory[7].find('used') > -1:
600+
data['usedMemory'] = str(int(float(memory[6]) / 1024)) + 'MB'
601+
else:
602+
data['usedMemory'] = str(int(float(memory[7]) / 1024)) + 'MB'
603+
604+
if memory[9].find('buff') > -1:
605+
data['buffCache'] = str(int(float(memory[8]) / 1024)) + 'MB'
606+
else:
607+
data['buffCache'] = str(int(float(memory[9]) / 1024)) + 'MB'
586608

587609
## Swap
588610

611+
589612
data['swapTotalMemory'] = str(int(float(swap[2]) / 1024)) + 'MB'
590613
data['swapFreeMemory'] = str(int(float(swap[4]) / 1024)) + 'MB'
591614
data['swapUsedMemory'] = str(int(float(swap[6]) / 1024)) + 'MB'
592-
data['swapBuffCache'] = str(int(float(swap[8]) / 1024)) + 'MB'
615+
616+
if swap[8].find('+') > -1:
617+
finalBuffCache = swap[8].split('+')[0]
618+
data['swapBuffCache'] = str(int(float(finalBuffCache) / 1024)) + 'MB'
619+
else:
620+
data['swapBuffCache'] = str(int(float(swap[8]) / 1024)) + 'MB'
593621

594622
## Processes
595623

@@ -686,7 +714,7 @@ def fetchPackages(request):
686714
return ACLManager.loadError()
687715

688716
data = json.loads(request.body)
689-
page = int(data['page'].rstrip('\n'))
717+
page = int(str(data['page']).rstrip('\n'))
690718
recordsToShow = int(data['recordsToShow'])
691719

692720
packageInformation = '/home/cyberpanel/OSPackages'
@@ -704,19 +732,20 @@ def fetchPackages(request):
704732
from s3Backups.s3Backups import S3Backups
705733

706734
pagination = S3Backups.getPagination(len(packages), recordsToShow)
707-
logging.CyberCPLogFileWriter.writeToFile(str(pagination))
708735
endPageNumber, finalPageNumber = S3Backups.recordsPointer(page, recordsToShow)
709736
finalPackages = packages[finalPageNumber:endPageNumber]
710737

711738
json_data = "["
712739
checker = 0
740+
counter = 0
713741

714742
# if os.path.exists(ProcessUtilities.debugPath):
715743
# logging.CyberCPLogFileWriter.writeToFile('Final packages: %s' % (str(finalPackages)))
716744
import re
717745
for items in finalPackages:
718746
items = re.sub(r'("[\s\w]*)"([\s\w])*"([\s\w]*)',r"\1\2\3", items)
719747
try:
748+
counter = counter + 1
720749
if checker == 0:
721750
json_data = json_data + items
722751
checker = 1
@@ -727,7 +756,7 @@ def fetchPackages(request):
727756

728757
json_data = json_data + ']'
729758

730-
data_ret = {'status': 1, 'packages': json_data, 'pagination': pagination}
759+
data_ret = {'status': 1, 'packages': json_data, 'pagination': pagination, 'fetchedPackages': counter, 'totalPackages': len(packages)}
731760
json_data = json.dumps(data_ret)
732761
return HttpResponse(json_data)
733762

‎static/databases/databases.js‎

100755100644
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ app.controller('createDatabase', function ($scope, $http) {
106106

107107
$scope.generatePassword = function () {
108108
$scope.generatedPasswordView = false;
109-
$scope.dbPassword = randomPassword(12);
109+
$scope.dbPassword = randomPassword(16);
110110
};
111111

112112
$scope.usePassword = function () {
@@ -447,7 +447,7 @@ app.controller('listDBs', function ($scope, $http) {
447447

448448
$scope.generatePassword = function () {
449449
$scope.generatedPasswordView = false;
450-
$scope.dbPassword = randomPassword(12);
450+
$scope.dbPassword = randomPassword(16);
451451
};
452452

453453
$scope.usePassword = function () {
@@ -493,4 +493,4 @@ app.controller('phpMyAdmin', function ($scope, $http, $window) {
493493
}
494494
setupPHPMYAdminSession();
495495

496-
});
496+
});

‎static/ftp/ftp.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ app.controller('createFTPAccount', function ($scope, $http) {
113113

114114
$scope.generatePassword = function () {
115115
$scope.generatedPasswordView = false;
116-
$scope.ftpPassword = randomPassword(12);
116+
$scope.ftpPassword = randomPassword(16);
117117
};
118118

119119
$scope.usePassword = function () {
@@ -451,11 +451,11 @@ app.controller('listFTPAccounts', function ($scope, $http) {
451451

452452
$scope.generatePassword = function () {
453453
$scope.generatedPasswordView = false;
454-
$scope.ftpPassword = randomPassword(12);
454+
$scope.ftpPassword = randomPassword(16);
455455
};
456456

457457
$scope.usePassword = function () {
458458
$scope.generatedPasswordView = true;
459459
};
460460

461-
});
461+
});

‎static/mailServer/mailServer.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ app.controller('createEmailAccount', function ($scope, $http) {
110110

111111
$scope.generatePassword = function () {
112112
$scope.generatedPasswordView = false;
113-
$scope.emailPassword = randomPassword(12);
113+
$scope.emailPassword = randomPassword(16);
114114
};
115115

116116
$scope.usePassword = function () {
@@ -465,7 +465,7 @@ app.controller('changeEmailPassword', function ($scope, $http) {
465465

466466
$scope.generatePassword = function () {
467467
$scope.generatedPasswordView = false;
468-
$scope.emailPassword = randomPassword(12);
468+
$scope.emailPassword = randomPassword(16);
469469
};
470470

471471
$scope.usePassword = function () {
@@ -1291,4 +1291,4 @@ app.controller('listEmails', function ($scope, $http) {
12911291
});
12921292

12931293

1294-
/* Java script code for List Emails Ends here */
1294+
/* Java script code for List Emails Ends here */

0 commit comments

Comments
 (0)