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

Documentation for Yaml/Xml configured files #868

Merged
merged 10 commits into from
Mar 21, 2024

Conversation

rhfogh
Copy link
Collaborator

@rhfogh rhfogh commented Mar 14, 2024

No description provided.

Copy link
Contributor

@fabcor-maxiv fabcor-maxiv left a comment

Choose a reason for hiding this comment

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

Thanks!

I made some suggestions (that you should be able to apply directly via the GitHub UI), hopefully they do not introduce any error.

(Not a policy as far as I can tell, maybe it is just a preference of mine) I think it would be nice to cut long sentences over multiple lines. Usually I tend to follow something like Semantic Line Breaks. From my point of view the gain is when reviewing diffs.

@rhfogh
Copy link
Collaborator Author

rhfogh commented Mar 15, 2024

Thanks, good improvement. I have added an additional commit introducing semantic line breaks.

@rhfogh rhfogh requested a review from oldfielj-ansto March 18, 2024 18:06
@rhfogh
Copy link
Collaborator Author

rhfogh commented Mar 18, 2024

The first version was incorrect on some points having to do with the XML-configured files. This should hopefully be better.

Copy link
Contributor

@fabcor-maxiv fabcor-maxiv left a comment

Choose a reason for hiding this comment

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

Some more suggestions. Note that the changes can all be "batched" together in one single commit via the GitHub web interface (or at least it should be possible, I have seen/done it before).

Configuration files are searched for by name in a series of directories given as a lookup path.
This is specified either with the `--coreConfigPath` command line parameter to MXCuBE,
or through the `MXCUBE_CORE_CONFIG_PATH` environment variable.
The files live under the `mxcubecore/mxcubecore/configuration` directory,
Copy link
Collaborator

@elmjag elmjag Mar 19, 2024

Choose a reason for hiding this comment

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

Is --coreConfigPath parameter specific for MxCube-QT? I'm getting unrecognized arguments error when trying to use this with mxcubeweb:

$ ./mxcubeweb-server --coreConfigPath foo
usage: mxcubeweb-server [-h] [-r HWR_DIRECTORY] [-s STATIC_FOLDER] [-l LOG_FILE] [-L LOG_LEVEL] [-el ENABLED_LOGGER_LIST] [-w] [-t]
mxcubeweb-server: error: unrecognized arguments: --coreConfigPath foo

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Good point - I'll fix this.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Thanks for noticing.

Configuration files are searched for by name in a series of directories given as a lookup path.
This is specified either with the `--coreConfigPath` command line parameter to MXCuBE,
or through the `MXCUBE_CORE_CONFIG_PATH` environment variable.
The files live under the `mxcubecore/mxcubecore/configuration` directory,
Copy link
Collaborator

Choose a reason for hiding this comment

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

The files live under the mxcubecore/mxcubecore/configuration directory,

Is that specific for MxCube-QT?

For the record, we keep our config files under /opt/mxcube/conf when deploing our MxCube-web.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, needs clarification.

@fabcor-maxiv
Copy link
Contributor

Seems like we should merge this, because the latest updates seem to be code changes rather than documentation.

@rhfogh
Copy link
Collaborator Author

rhfogh commented Mar 21, 2024

You are right. I was waiting for @oldfielj-ansto, but it is time now. Merging.

@rhfogh rhfogh merged commit 2a18bd7 into mxcube:develop Mar 21, 2024
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants