Skip to content

Commit

Permalink
feat(log): extra logging for local ckan;
Browse files Browse the repository at this point in the history
- Log execution of ckanapi commands for local ckan.
  • Loading branch information
JVickery-TBS committed Mar 13, 2024
1 parent 806ec26 commit 55115ff
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 2 deletions.
46 changes: 44 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ multiple worker processes using the `-p` parameter. The jobs in progress,
the rate of job completion and any individual errors are shown on STDERR
while the jobs run.

There are no parallel limits when running against a CKAN on localhost.
There are no parallel limits when running against a CKAN on localhost.
When running against a remote site, there's a default limit of 3 worker processes.

The environment variables `CKANAPI_MY_SITES` and`CKANAPI_PARALLEL_LIMIT` can be
Expand Down Expand Up @@ -352,7 +352,7 @@ ua = 'ckanapiexample/1.0 (+http://example.com/my/website)'
demo = RemoteCKAN('https://demo.ckan.org', user_agent=ua)
packages = demo.action.package_search(q='+organization:sample-organization +res_format:GeoJSON +tags:geojson')
print(packages)
```
```

Many CKAN API functions can only be used by authenticated users. Use the
`apikey` parameter to supply your CKAN API key to `RemoteCKAN`:
Expand Down Expand Up @@ -463,6 +463,48 @@ anon = LocalCKAN(username='')
print(anon.action.status_show())
```

#### Extra Loggging

To enable extra debug logging for the execution of LocalCKAN ckanapi commands, you can enable the config option in your CKAN INI file.

```
ckanapi.log_local = True
```

The output of the log will look like:

```
DEBUG [ckanapi.cli.main] OS User <user> executed LocalCKAN: ckanapi <args>
```

Because the ckanapi namespace does not match ckan or ckanext namespaces, you may need to create a new logging handler. Example:

```
[loggers]
keys = ckanapi
[handlers]
keys = console
[formatters]
keys = generic
[logger_ckanapi]
level = DEBUG
handlers = console
qualname = ckanapi
propagate = 0
[handler_console]
class = StreamHandler
args = (sys.stderr,)
level = NOTSET
formatter = generic
[formatter_generic]
format = %(asctime)s %(levelname)-5.5s [%(name)s] %(message)s
```

### TestAppCKAN

A class is provided for making action requests to a
Expand Down
25 changes: 25 additions & 0 deletions ckanapi/cli/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
import os
from docopt import docopt
from pkg_resources import load_entry_point
import subprocess

from ckanapi.version import __version__
from ckanapi.remoteckan import RemoteCKAN
Expand All @@ -98,7 +99,10 @@
from ckanapi.cli.search import search_datasets
from ckanapi.cli.batch import batch_actions

from logging import getLogger


log = getLogger(__name__)
PYTHON2 = str is bytes

def parse_arguments():
Expand Down Expand Up @@ -130,6 +134,27 @@ def main(running_with_paster=False):
)
else:
ckan = LocalCKAN(username=arguments['--ckan-user'])
# log execution of LocalCKAN commands
from ckan.plugins.toolkit import config, asbool
if asbool(config.get('ckanapi.log_local')) and len(sys.argv) > 1:
cmd = ['who', 'am', 'i']
proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
out, err = proc.communicate()
if not out or err:
# fallback to whoami if `who am i` is empty or errored
cmd = ['whoami']
proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
out, err = proc.communicate()
if not out or err:
# cannot find user
out = '<unknown user>'
else:
# remove line breaks from whoami's
out = out.replace('\n', '').replace('\r', '')
log.debug('OS User %s executed LocalCKAN: ckanapi %s',
out, u' '.join(sys.argv[1:]))

stdout = getattr(sys.stdout, 'buffer', sys.stdout)
if arguments['action']:
Expand Down

0 comments on commit 55115ff

Please sign in to comment.