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

Web doc improvement #1396

Merged
merged 28 commits into from
Feb 26, 2016
Merged

Web doc improvement #1396

merged 28 commits into from
Feb 26, 2016

Conversation

atarkowska
Copy link
Member

@snoopycrimecop
Copy link
Member

Conflicting PR. Removed from build OMERO-DEV-merge-docs#225. See the console output for more details.
Possible conflicts:

@hflynn hflynn added the develop label Feb 8, 2016

Install `Django 1.8`_,
`Gunicorn >= 19.3 <http://gunicorn.org>`_
and `futures <https://pypi.python.org/pypi/futures>`_ using package requirements file:
Copy link
Member

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?

Copy link
Member Author

Choose a reason for hiding this comment

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

Copy link
Member

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?

Copy link
Member Author

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

Copy link
Member

Choose a reason for hiding this comment

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

typo: recomanded, abbility

Copy link
Member Author

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

Copy link

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
---------------
Copy link
Member

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 ?

Copy link
Member Author

Choose a reason for hiding this comment

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

moved now

Copy link
Member

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

Copy link
Member

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
Copy link
Contributor

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``
Copy link

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
Copy link
Contributor

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

@chris-allan
Copy link
Member

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.

@hflynn
Copy link
Contributor

hflynn commented Feb 23, 2016

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.

@jburel
Copy link
Member

jburel commented Feb 24, 2016

Updated the scripts on omero-install see ome/omero-install#92 to match the gunicorn minimum version

@jburel
Copy link
Member

jburel commented Feb 24, 2016

shouldn't you set the minimum version when installing gevent since it is what is indicated in the line above.
i.e. pip install "gevent>=0.13"

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
Copy link
Contributor

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

@hflynn
Copy link
Contributor

hflynn commented Feb 25, 2016

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.

@hflynn
Copy link
Contributor

hflynn commented Feb 25, 2016

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).

@hflynn
Copy link
Contributor

hflynn commented Feb 26, 2016

Merging and opening a new PR for further cross-references.

hflynn pushed a commit that referenced this pull request Feb 26, 2016
@hflynn hflynn merged commit a8bfa6c into ome:develop Feb 26, 2016
@atarkowska atarkowska deleted the fix_download_doc branch February 26, 2016 12:19
@sbesson sbesson added this to the 5.2.2 milestone Nov 29, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants