Log lock state on conflict

[icewind1991]

Also log the lock state that causes the conflict when a locking error occurs.

[MorrisJobke]

Tested and works 👍

[MorrisJobke]

@icewind1991 Could you also add the same stuff for DB based locks?

[MorrisJobke]

BTW this looks then like this:

{
    "reqId": "HLWWOgSfTJLezqiqgA48",
    "level": 4,
    "time": "2018-05-04T12:22:33+00:00",
    "remoteAddr": "172.20.0.1",
    "user": "admin",
    "app": "webdav",
    "method": "MOVE",
    "url": "/remote.php/dav/uploads/admin/web-file-upload-cdc905d9d8aed4152d0876181bb5212c-1525436523116/.file",
    "message": {
        "Exception": "OCA\\DAV\\Connector\\Sabre\\Exception\\FileLocked",
        "Message": "\"filename.png\" is locked",
        "Code": 0,
        "Trace": [...],
        "File": "/var/www/html/apps/dav/lib/Connector/Sabre/File.php",
        "Line": 201,
        "Previous": {
            "Exception": "OCP\\Lock\\LockedException",
            "Message": "\"filename.png\" is locked",
            "Code": 0,
            "Trace": [...],
            "File": "/var/www/html/lib/private/Files/View.php",
            "Line": 1970,
            "Previous": {
                "Exception": "OCP\\Lock\\LockedException",
                "Message": "\"files/3b3f0e53c6300006db7fe574a649f043\" is locked, existing lock on file: 3 shared locks",
                "Code": 0,
                "Trace": [...],
                "File": "/var/www/html/lib/private/Lock/MemcacheLockingProvider.php",
                "Line": 123
            }
        },
        "CustomMessage": "--"
    },
    "userAgent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_4) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.1 Safari/605.1.15",
    "version": "14.0.0.2"
}