Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-03-01 03:10:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix typos and translate comments to English.

Browse source 
Thanks to xet7 !
This commit is contained in:
Lauri Ojansivu 2022-09-22 14:45:41 +03:00
parent e2c241f4a8
commit 551f57b03b
2 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

46
models/server/metrics.js
View file

@ -1,39 +1,39 @@
import { Meteor } from 'meteor/meteor'; import { Meteor } from 'meteor/meteor';
import Users from '../users'; import Users from '../users';
function acceptedIpAdress(ipAdress) { function acceptedIpAddress(ipAddress) {
//return true if a given ipAdress was setted by an admin user //return true if a given ipAddress was setted by an admin user
// console.log('idpAdress', ipAdress); // console.log('idpAddress', ipAddress);
//Check if ipAdress is accepted //Check if ipAddress is accepted
// console.log( // console.log(
// 'process.env.WEKAN_METRICS_ACCEPTED_IP_ADRESS', // 'process.env.WEKAN_METRICS_ACCEPTED_IP_ADDRESS',
// process.env.WEKAN_METRICS_ACCEPTED_IP_ADRESS, // process.env.WEKAN_METRICS_ACCEPTED_IP_ADDRESS,
// ); // );
//console.log("process.env", process.env); //console.log("process.env", process.env);
const trustedIpAdress = process.env.WEKAN_METRICS_ACCEPTED_IP_ADRESS; const trustedIpAddress = process.env.WEKAN_METRICS_ACCEPTED_IP_ADDRESS;
//console.log("trustedIpAdress", trustedIpAdress); //console.log("trustedIpAddress", trustedIpAddress);
//console.log("trustedIpAdress !== undefined && trustedIpAdress.split(",").includes(ipAdress)", trustedIpAdress !== undefined && trustedIpAdress.split(",").includes(ipAdress)); //console.log("trustedIpAddress !== undefined && trustedIpAddress.split(",").includes(ipAddress)", trustedIpAddress !== undefined && trustedIpAddress.split(",").includes(ipAddress));
return ( return (
trustedIpAdress !== undefined && trustedIpAddress !== undefined &&
trustedIpAdress.split(',').includes(ipAdress) trustedIpAddress.split(',').includes(ipAddress)
); );
} }
Meteor.startup(() => { Meteor.startup(() => {
WebApp.connectHandlers.use('/metrics', (req, res, next) => { WebApp.connectHandlers.use('/metrics', (req, res, next) => {
try { try {
const ipAdress = const ipAddress =
req.headers['x-forwarded-for'] || req.socket.remoteAddress; req.headers['x-forwarded-for'] || req.socket.remoteAddress;
// if(process.env.TRUST_PROXY_FORXARD) // if(process.env.TRUST_PROXY_FORXARD)
// { // {
// const ipAdress = req.headers['x-forwarded-for'] || req.socket.remoteAddress // const ipAddress = req.headers['x-forwarded-for'] || req.socket.remoteAddress
// }else{ // }else{
// const ipAdress = req.socket.remoteAddress // const ipAddress = req.socket.remoteAddress
// } // }
// List of trusted ip adress will be found in environment variable "WEKAN_METRICS_ACCEPTED_IP_ADRESS" (separeted with commas) // List of trusted ip adress will be found in environment variable "WEKAN_METRICS_ACCEPTED_IP_ADDRESS" (separeted with commas)
if (acceptedIpAdress(ipAdress)) { if (acceptedIpAddress(ipAddress)) {
let metricsRes = ''; let metricsRes = '';
let resCount = 0; let resCount = 0;
//connected users //connected users
@ -89,9 +89,9 @@ Meteor.startup(() => {
metricsRes += 'registeredboardsWithOnlyOneMember ' + resCount + '\n'; metricsRes += 'registeredboardsWithOnlyOneMember ' + resCount + '\n';
resCount = 0; resCount = 0;
// KPI 6 : - stocker la date de dernière connexion // KPI 6 : - store last login date
// KPI 6 = count where date de dernière connexion > x jours // KPI 6 = count where date of last connection > x days
// Découpe en label since 5 jours / 10 jours / 20 Jours / 30 jours // Cutting in label since 5 days / 10 days / 20 days / 30 days
//Number of users with last connection dated 5 days ago //Number of users with last connection dated 5 days ago
metricsRes += metricsRes +=
@ -151,16 +151,16 @@ Meteor.startup(() => {
'usersWithLastConnectionDated30DaysAgo ' + resCount + '\n'; 'usersWithLastConnectionDated30DaysAgo ' + resCount + '\n';
resCount = 0; resCount = 0;
// TO DO: // TO DO:
// moyenne de connexion : ((date de déconnexion - date de dernière connexion) + (dernière moyenne)) / 2 // connection average: ((disconnection date - last connection date) + (last average)) / 2
// KPI 7 : somme des moyenne de connexion / nombre d'utilisateur (à ignore les utilisateur avec 0 moyenne) // KPI 7 : sum of connection average / number of users (to ignore users with 0 average)
res.writeHead(200); // HTTP status res.writeHead(200); // HTTP status
res.end(metricsRes); res.end(metricsRes);
} else { } else {
res.writeHead(401); // HTTP status res.writeHead(401); // HTTP status
res.end( res.end(
'IpAdress: ' + 'IpAddress: ' +
ipAdress + ipAddress +
' is not authorized to perform this action !!\n', ' is not authorized to perform this action !!\n',
); );
} }

2
server/publications/users.js
View file

@ -98,7 +98,7 @@ if (Meteor.isServer) {
// console.log('meteor session', socket._meteorSession.userId), // console.log('meteor session', socket._meteorSession.userId),
// ); // );
// update last connected user date (neddeed for one of the KPI) // update last connected user date (needed for one of the KPI)
Meteor.server.stream_server.open_sockets.forEach( Meteor.server.stream_server.open_sockets.forEach(
(socket) => (socket) =>
//console.log('meteor session', socket._meteorSession.userId), //console.log('meteor session', socket._meteorSession.userId),