Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Admin - Log OGC request if error #5066

Merged
merged 3 commits into from
Dec 3, 2024

Conversation

Gustry
Copy link
Member

@Gustry Gustry commented Dec 3, 2024

Follow up from #4960

Superseeds #5004

@Gustry Gustry force-pushed the follow-up-http-request-error branch from 0c9c58d to 6bdc728 Compare December 3, 2024 10:19
@Gustry Gustry added the run end2end If the PR must run end2end tests or not label Dec 3, 2024
@Gustry Gustry force-pushed the follow-up-http-request-error branch from 6bdc728 to d14e21e Compare December 3, 2024 11:17
lizmap/modules/lizmap/lib/Request/OGCRequest.php Outdated Show resolved Hide resolved
lizmap/modules/lizmap/lib/Request/OGCRequest.php Outdated Show resolved Hide resolved
lizmap/modules/lizmap/lib/Request/OGCRequest.php Outdated Show resolved Hide resolved
@Gustry Gustry force-pushed the follow-up-http-request-error branch from 3aeddfd to bb0151a Compare December 3, 2024 14:08
@Gustry
Copy link
Member Author

Gustry commented Dec 3, 2024

This is now the example of the log :

2024-12-03 15:04:10	172.18.0.1	lizmapadmin	The HTTP OGC request to QGIS Server ended with an error. HTTP code 400 on "REPOSITORY" = 'testsrepository' & "PROJECT" = 'print' & "SERVICE" = 'WMS' & "REQUEST" = 'getprint' & "CRS" = 'EPSG:2154' & "DPI" = '100' & "FORMAT" = 'pdf' & "MAP0:EXTENT" = '767762.049,6277517.116350001,773437.049,6281267.116350001' & "MAP0:LAYERS" = 'OpenStreetMap,quartiers,sourtiers' & "MAP0:OPACITIES" = '204,255,255' & "MAP0:SCALE" = '25000' & "MAP0:STYLES" = 'default,défaut,défaut' & "MULTILINE_LABEL" = 'Multiline label' & "SIMPLE_LABEL" = 'simple label' & "TEMPLATE" = 'print_labels' & "TRANSPARENT" = 'true' & "VERSION" = '1.3.0' & "LIZMAP_USER" = 'admin' & "LIZMAP_USER_GROUPS" = 'admins' & "LIZMAP_OVERRIDE_FILTER" = '1'

@Gustry Gustry force-pushed the follow-up-http-request-error branch from bb0151a to f001200 Compare December 3, 2024 14:27
@Gustry Gustry requested a review from nworr December 3, 2024 15:16
@Gustry Gustry force-pushed the follow-up-http-request-error branch from f001200 to 5d222a0 Compare December 3, 2024 16:08
@Gustry Gustry merged commit 3cbd12f into 3liz:master Dec 3, 2024
13 checks passed
@Gustry Gustry deleted the follow-up-http-request-error branch December 3, 2024 16:29
@3liz-bot
Copy link
Contributor

3liz-bot commented Dec 3, 2024

The backport to release_3_7 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply d14e21e4a... Admin - Log OGC request if error
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging lizmap/modules/view/locales/en_US/dictionnary.UTF-8.properties
CONFLICT (content): Merge conflict in lizmap/modules/view/locales/en_US/dictionnary.UTF-8.properties

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release_3_7 release_3_7
# Navigate to the new working tree
cd .worktrees/backport-release_3_7
# Create a new branch
git switch --create backport-5066-to-release_3_7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick d14e21e4ac3683b812a7930c167ec18d6de1a00a,1c73f74a5256be67a98ea264dfc5a03b9ed8eb7a,5d222a0568bcc1acda04ad168ff7be137eec0d3b
# Push it to GitHub
git push --set-upstream origin backport-5066-to-release_3_7
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_7

Then, create a pull request where the base branch is release_3_7 and the compare/head branch is backport-5066-to-release_3_7.

Copy link
Contributor

@nworr nworr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Additionaly , i think
$appContext->logMessage( .. may be used as well (testing purpose only)

Gustry added a commit that referenced this pull request Dec 3, 2024
[Backport release_3_7] Admin - Log OGC request if error #5066
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants