This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 121306328494f1e1228ad8f335bb6befe792ff79 (commit)
from 1c8715b76c19ce660e11d75915bf4f0a8fccebd3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=121306328494f1e1228ad8f335bb6befe792ff79
commit 121306328494f1e1228ad8f335bb6befe792ff79
Author: Franck Villaume <[email protected]>
Date: Fri Jun 28 22:26:16 2019 +0200
quota_management: display info on admin view
diff --git
a/src/plugins/quota_management/common/quota_managementPlugin.class.php
b/src/plugins/quota_management/common/quota_managementPlugin.class.php
index faf2d41..1245a25 100644
--- a/src/plugins/quota_management/common/quota_managementPlugin.class.php
+++ b/src/plugins/quota_management/common/quota_managementPlugin.class.php
@@ -123,7 +123,10 @@ to monitor disk and database usage per user, project.");
function getDocumentsSizeQuery() {
return db_query_params('SELECT doc_data.group_id,
SUM(doc_data_version.filesize) as size,
SUM(octet_length(doc_data_version.data_words)) as size1
- FROM doc_data, doc_data_version WHERE
doc_data.docid = doc_data_version.docid GROUP BY doc_data.group_id',
+ FROM doc_data, doc_data_version
+ WHERE doc_data.docid =
doc_data_version.docid
+ GROUP BY doc_data.group_id
+ ORDER BY doc_data.group_id',
array());
}
@@ -133,6 +136,17 @@ to monitor disk and database usage per user, project.");
array($group_id));
}
+ function getTrackersSizeQuery() {
+ return db_query_params('SELECT artifact_group_list.group_id,
SUM(octet_length(artifact.summary)+octet_length(artifact.details)+octet_length(artifact_message.body)+artifact_file.filesize)
as size
+ FROM artifact, artifact_group_list,
artifact_message, artifact_file
+ WHERE artifact.group_artifact_id =
artifact_group_list.group_artifact_id
+ AND artifact.artifact_id =
artifact_message.artifact_id
+ AND artifact.artifact_id =
artifact_file.artifact_id
+ GROUP BY artifact_group_list.group_id
+ ORDER BY artifact_group_list.group_id',
+ array());
+ }
+
function getTrackerSizeForProject($group_id) {
return db_query_params('SELECT
SUM(octet_length(artifact.summary)+octet_length(artifact.details)+octet_length(artifact_message.body)+artifact_file.filesize)
as size, count(artifact_group_list.group_artifact_id) as nb
FROM artifact, artifact_group_list,
artifact_message, artifact_file
@@ -143,6 +157,16 @@ to monitor disk and database usage per user, project.");
array($group_id));
}
+ function getFRSSizeQuery() {
+ return db_query_params('SELECT frs_package.group_id,
SUM(octet_length(frs_package.name)+octet_length(frs_release.name)+octet_length(frs_release.notes)+octet_length(frs_release.changes)+frs_file.file_size)
as size
+ FROM frs_package, frs_release, frs_file
+ WHERE frs_package.package_id =
frs_release.package_id
+ AND frs_release.release_id =
frs_file.release_id
+ GROUP BY frs_package.group_id
+ ORDER BY frs_package.group_id',
+ array());
+ }
+
function getFRSSizeForProject($group_id) {
return db_query_params('SELECT
SUM(octet_length(frs_package.name)+octet_length(frs_release.name)+octet_length(frs_release.notes)+octet_length(frs_release.changes)+frs_file.file_size)
as size, count(frs_package.package_id) as nb
FROM frs_package, frs_release, frs_file
@@ -152,6 +176,16 @@ to monitor disk and database usage per user, project.");
array($group_id));
}
+ function getPMSizeQuery() {
+ return db_query_params('SELECT project_group_list.group_id,
SUM(octet_length(project_group_list.description)+octet_length(project_task.summary)+octet_length(project_task.details)+octet_length(project_messages.body))
as size
+ FROM project_group_list, project_task,
project_messages
+ WHERE
project_group_list.group_project_id = project_task.group_project_id
+ AND project_task.project_task_id =
project_messages.project_task_id
+ GROUP BY project_group_list.group_id
+ ORDER BY project_group_list.group_id',
+ array());
+ }
+
function getPMSizeForProject($group_id) {
return db_query_params('SELECT
SUM(octet_length(project_group_list.description)+octet_length(project_task.summary)+octet_length(project_task.details)+octet_length(project_messages.body))
as size, count(project_group_list.group_project_id) as nb
FROM project_group_list, project_task,
project_messages
diff --git a/src/plugins/quota_management/view/quota.php
b/src/plugins/quota_management/view/quota.php
index afb964b..9403341 100644
--- a/src/plugins/quota_management/view/quota.php
+++ b/src/plugins/quota_management/view/quota.php
@@ -66,6 +66,8 @@ if (db_numrows($res_db) > 0) {
$quotas["$e[group_id]"]["disk_size_scm"] = 0;
$quotas["$e[group_id]"]["quota_hard"] = $e["quota_hard"] *
$_quota_block_size;
$quotas["$e[group_id]"]["quota_soft"] = $e["quota_soft"] *
$_quota_block_size;
+ $quotas["$e[group_id]"]["quota_db_hard"] = $e["quota_db_hard"]
* $_quota_block_size;
+ $quotas["$e[group_id]"]["quota_db_soft"] = $e["quota_db_soft"]
* $_quota_block_size;
}
}
@@ -81,6 +83,39 @@ if (forge_get_config('use_docman')) {
}
}
+// trackers database size
+if (forge_get_config('use_tracker')) {
+ $res_db = $quota_management->getTrackersSizeQuery();
+ if (db_numrows($res_db) > 0) {
+ while($e = db_fetch_array($res_db)) {
+ $q = array();
+ $quotas["$e[group_id]"]["database_size"] += $e["size"];
+ }
+ }
+}
+
+// FRS database size
+if (forge_get_config('use_frs')) {
+ $res_db = $quota_management->getFRSSizeQuery();
+ if (db_numrows($res_db) > 0) {
+ while($e = db_fetch_array($res_db)) {
+ $q = array();
+ $quotas["$e[group_id]"]["database_size"] += $e["size"];
+ }
+ }
+}
+
+// PM database size
+if (forge_get_config('use_frs')) {
+ $res_db = $quota_management->getPMSizeQuery();
+ if (db_numrows($res_db) > 0) {
+ while($e = db_fetch_array($res_db)) {
+ $q = array();
+ $quotas["$e[group_id]"]["database_size"] += $e["size"];
+ }
+ }
+}
+
// news database size
if (forge_get_config('use_news')) {
$res_db = db_query_params('SELECT group_id, SUM(octet_length(summary) +
octet_length(details)) as size FROM news_bytes GROUP BY group_id',
-----------------------------------------------------------------------
Summary of changes:
.../common/quota_managementPlugin.class.php | 36 +++++++++++++++++++++-
src/plugins/quota_management/view/quota.php | 35 +++++++++++++++++++++
2 files changed, 70 insertions(+), 1 deletion(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
