MAAS

Merge lp:~andreserl/maas/lp1604901 into lp:~maas-committers/maas/trunk

  1. lp1604901
  2. Merge into trunk
Proposed by Andres Rodriguez
Status: Merged
Merged at revision: 5191
Proposed branch: lp:~andreserl/maas/lp1604901
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 25 lines (+7/-1)
1 file modified
src/maasserver/api/events.py (+7/-1)
To merge this branch: bzr merge lp:~andreserl/maas/lp1604901
Reviewer Review Type Date Requested Status
Mike Pontillo (community) Approve
Review via email: mp+300673@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Mike Pontillo (mpontillo) wrote :

Looks good to me.

As an aside, I wonder why we chose 1000 as an arbitrary limit. It seems like it would be fine for it to be higher, for ease-of-API-use in support cases.

review: Approve
Revision history for this message
LaMont Jones (lamont) wrote :

I believe that my suggested wording is more in line with other API docstrings.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/maasserver/api/events.py'
--- src/maasserver/api/events.py 2016-04-12 22:25:44 +0000
+++ src/maasserver/api/events.py 2016-07-20 22:15:43 +0000
@@ -26,7 +26,7 @@
26from maasserver.models.eventtype import LOGGING_LEVELS_BY_NAME26from maasserver.models.eventtype import LOGGING_LEVELS_BY_NAME
2727
2828
29MAX_EVENT_LOG_COUNT = 100029MAX_EVENT_LOG_COUNT =
30DEFAULT_EVENT_LOG_LIMIT = 10030DEFAULT_EVENT_LOG_LIMIT = 100
3131
3232
@@ -89,6 +89,12 @@
89 :param level: Desired minimum log level of returned events. Returns89 :param level: Desired minimum log level of returned events. Returns
90 this level of events and greater. Choose from: %(log_levels)s.90 this level of events and greater. Choose from: %(log_levels)s.
91 The default is INFO.91 The default is INFO.
92 :param limit: Optional number of events to return. Default 100.
93 Maximum: 1000.
94 :param before: Optional event id. Defines where to start returning
95 older events.
96 :param after: Optional event id. Defines where to start returning
97 newer events.
92 """98 """
93 # Filter first by optional node ID, hostname, MAC, etc.99 # Filter first by optional node ID, hostname, MAC, etc.
94 nodes = filtered_nodes_list_from_request(request)100 nodes = filtered_nodes_list_from_request(request)