Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions cloud_platform/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,11 @@
{
"name": "Cloud Platform",
"summary": "Addons required for the Camptocamp Cloud Platform",
"version": "18.0.1.0.0",
"version": "18.0.1.0.1",
"author": "Camptocamp,Odoo Community Association (OCA)",
"license": "AGPL-3",
"category": "Extra Tools",
"depends": [
"session_redis",
"monitoring_status",
"logging_json",
"server_environment", # OCA/server-tools
],
"depends": ["session_redis", "monitoring_status", "logging_json"],
"website": "https://github.com/camptocamp/odoo-cloud-platform",
"data": [],
"installable": True,
}
3 changes: 1 addition & 2 deletions cloud_platform/models/cloud_platform.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import re

from odoo import api, models
from odoo.tools.config import config

from .strtobool import strtobool

Expand All @@ -22,7 +21,7 @@ class CloudPlatform(models.AbstractModel):
_description = "cloud.platform"

def _get_running_env(self):
environment_name = config["running_env"]
Comment thread
yankinmax marked this conversation as resolved.
environment_name = os.environ.get("RUNNING_ENV")
if environment_name.startswith("labs"):
# We allow to have environments such as 'labs-logistics'
# or 'labs-finance', in order to have the matching ribbon.
Expand Down
11 changes: 3 additions & 8 deletions monitoring_prometheus/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,12 @@

{
"name": "Monitoring: Prometheus Metrics",
"version": "18.0.1.0.0",
"version": "18.0.1.0.1",
"author": "Camptocamp,Odoo Community Association (OCA)",
"license": "AGPL-3",
"category": "category",
"depends": [
"base",
"web",
"server_environment",
],
"category": "Extra Tools",
"depends": ["base", "web"],
"website": "https://github.com/camptocamp/odoo-cloud-platform",
"data": [],
"external_dependencies": {
"python": ["prometheus_client"],
},
Expand Down
2 changes: 2 additions & 0 deletions monitoring_prometheus/models/ir_http.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ class IrHttp(models.AbstractModel):

@classmethod
def _dispatch(cls, endpoint):
# httprequest environment is updated with WSGI environment variables in core
# REF: https://github.com/odoo/odoo/blob/18.0/odoo/http.py#L1992
path_info = request.httprequest.environ.get("PATH_INFO")

if path_info.startswith("/longpolling/"):
Expand Down
Loading