Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
R
relay
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 7
    • Issues 7
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 1
    • Merge Requests 1
  • Operations
    • Operations
    • Incidents
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • Repository
    • Value Stream
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Commits
  • Issue Boards
  • Pleroma
  • relay
  • Merge Requests
  • !19

Merged
Opened Aug 05, 2019 by Izalia Mae@izaliaContributor
  • Report abuse
Report abuse

Fix db wipe on json error and default config checking

  • Overview 0
  • Changes 3

Firstly, because of how the db was loaded, it would create a new one on any error. This can be an issue if the json is invalid at all. It now exits on a json error to avoid wiping the db and creates a new one on a missing file error.

Secondly, the AP_CONFIG variable would only drop back to defaults if the whole ap section was missing. I figured it would be a good idea to provide defaults for everyting in init just so it wouldn't have to be done anywhere else again in the future.

Edited Aug 05, 2019 by Izalia Mae
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: pleroma/relay!19
Source branch: fix

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.