-
Notifications
You must be signed in to change notification settings - Fork 51
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
Web doc improvement #1396
Web doc improvement #1396
Conversation
Conflicting PR. Removed from build OMERO-DEV-merge-docs#225. See the console output for more details.
|
8f005ef
to
e7d8a10
Compare
|
||
Install `Django 1.8`_, | ||
`Gunicorn >= 19.3 <http://gunicorn.org>`_ | ||
and `futures <https://pypi.python.org/pypi/futures>`_ using package requirements file: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Where does the requirement for futures
come from? Which PR will be responsible for adding it to share/web/requirements-py27-nginx.txt
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
corresponding PR given in the description https://github.com/openmicroscopy/openmicroscopy/pull/4447/files#diff-726e917f2a5b8715f138941e647d150fR8
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missed that thanks. I looked in the snoopy merge for related PRs, but I assume it was omitted for Travis reasons. Can you still explain the requirement though?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I excluded it this morning, as we omitted travis. Threads requires futures, see benoitc/gunicorn#1200
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
typo: recomanded, abbility
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jburel "recomanded"? never heard of
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"using the"
.. _nginx_troubleshooting: | ||
|
||
Troubleshooting | ||
--------------- |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this section be appended to the troubleshooting page instead and have a reference to it here ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
moved now
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
some typo: Benchamrk, banchmark, concurent
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
recomand
@@ -342,6 +344,33 @@ OMERO.web did not start | |||
|
|||
:ome-users:`upgrade 5.0.5 to 5.1.1 omero.web forbidden <2015-April/005316.html>` | |||
|
|||
OMERO.web runing but status says not started |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
runing -> running
Stopping OMERO.web... [OK] | ||
Django WSGI workers (PID 59217) killed. | ||
|
||
Then consult nginx ``error.log`` and ``OMERO.server/var/log/OMEROweb.log`` |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
:file: for both rather than using two backticks.
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
||
If you upgraded OMERO but forgot to stop OMERO.web, processes will still be | ||
running. In order to kill stale processes by hand, run:: $ ps aux | grep /home/omero/OMERO.server/var/django.pid |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This command isn't marked-up on staging because you need to start a new line and indent for the ::
to work
As a follow up to the discussion on ome/openmicroscopy#4447, I would suggest moving the experimental worker modes to the bottom of the page. |
This is looking okay formatting and English-wise now. Assume we are waiting on the sync/async workers code PR going in before this is finalised so holding off merging for now. |
Updated the scripts on omero-install see ome/omero-install#92 to match the gunicorn minimum version |
shouldn't you set the minimum version when installing gevent since it is what is indicated in the line above. |
you expect to have. OMERO.web should only need 4-12 worker | ||
processes to handle many requests per second. | ||
|
||
- :property:`omero.web.wsgi_threads` to 2—4 x NUM_CORES the number of worker threads |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This property is still missing from the config page
Okay, this isn't the prettiest page but I'm inclined to merge rather than nitpicking about the number of note boxes now, that okay with you @jburel ? Likely we'll need a tidy up once the people who reported the issue look at it anyway. |
Ah okay, talked to @pwalczysko - will hold off merging until after discussion tomorrow incase we want to e.g. add further reference to this on the troubleshooting page (although even if we do, the best way to do it may well be to merge this and then for me to open a new PR to add further tweaks). |
Merging and opening a new PR for further cross-references. |
This PR improves web deployment as in ome/openmicroscopy#4447
Check https://www.openmicroscopy.org/site/support/omero5.2-staging/sysadmins/unix/install-web/install-nginx.html