Add EventSource to the public API #10739

icewind1991 · 2014-08-29T15:24:13Z

Also fixes EventSource to not start sending output the moment we construct it but wait until we start sending data.

cc @PVince81 @DeepDiver1975 @MorrisJobke

ghost · 2014-08-29T19:56:22Z

🚀 Test Passed. 🚀
Refer to this link for build results: https://ci.owncloud.org/job/pull-request-analyser/6992/

MorrisJobke · 2014-08-30T16:47:45Z

@icewind1991 A test case would be really nice

DeepDiver1975 · 2014-08-31T10:18:08Z

@icewind1991 A test case would be really nice

yes - please - besides that: looks good 👍

DeepDiver1975 · 2014-09-03T09:20:49Z

@icewind1991 squash and rebase please

MorrisJobke · 2014-09-03T09:35:58Z

test case means how to test this change (manually)

…ctor

ghost · 2014-09-03T11:55:22Z

🚀 Test Passed. 🚀
Refer to this link for build results: https://ci.owncloud.org/job/pull-request-analyser/7063/

icewind1991 · 2014-09-03T13:45:26Z

Basic manual test: run scanFiles(true) in the js console while in the files app, if the progress is shown in the console then the event source is working

PVince81 · 2014-09-03T16:09:15Z

lib/private/server.php

@@ -492,4 +492,13 @@ function getCertificateManager($user = null) {
 		}
 		return new CertificateManager($user);
 	}
+
+	/**
+	 * Returns a search instance


Please update the comment.
It's important to state that this will CREATE a new event source, as the class itself doesn't have any "open()" method.

I'd almost even prefer calling it createEventSource(), because when seeing getEventSource() used somewhere it is not clear that we are getting new instance instead of a possibly cached one.

If you compare with other services above they all seem to have singletons.

icewind1991 · 2014-09-03T23:10:36Z

@PVince81 switched to createEventSource()

ghost · 2014-09-03T23:25:37Z

🚀 Test Passed. 🚀
Refer to this link for build results: https://ci.owncloud.org/job/pull-request-analyser/7082/

MorrisJobke · 2014-09-04T06:01:20Z

👎

{"reqId":"54080001a86f8","app":"index","message":"BadMethodCallException: Type needs to be alphanumeric","level":4,"time":"2014-09-04T06:00:33+00:00","method":"GET","url":"\/master\/index.php\/apps\/files\/ajax\/scan.php?force=false&dir=&requesttoken=IvcDSomqR2KLX6smuSDpD.YVraGr2o"}
{"reqId":"54080001a86f8","app":"index","message":"Exception: #1 \/home\/mjob\/Projekte\/owncloud\/master\/apps\/files\/ajax\/scan.php(34): OC_EventSource->close()","level":4,"time":"2014-09-04T06:00:33+00:00","method":"GET","url":"\/master\/index.php\/apps\/files\/ajax\/scan.php?force=false&dir=&requesttoken=IvcDSomqR2KLX6smuSDpD.YVraGr2o"}
{"reqId":"54080001a86f8","app":"index","message":"Exception: #2 \/home\/mjob\/Projekte\/owncloud\/master\/lib\/private\/route\/route.php(135) : runtime-created function(1): require_once('\/home\/mjob\/Proj...')","level":4,"time":"2014-09-04T06:00:33+00:00","method":"GET","url":"\/master\/index.php\/apps\/files\/ajax\/scan.php?force=false&dir=&requesttoken=IvcDSomqR2KLX6smuSDpD.YVraGr2o"}
{"reqId":"54080001a86f8","app":"index","message":"Exception: #3 [internal function]: __lambda_func(Array)","level":4,"time":"2014-09-04T06:00:33+00:00","method":"GET","url":"\/master\/index.php\/apps\/files\/ajax\/scan.php?force=false&dir=&requesttoken=IvcDSomqR2KLX6smuSDpD.YVraGr2o"}
{"reqId":"54080001a86f8","app":"index","message":"Exception: #4 \/home\/mjob\/Projekte\/owncloud\/master\/lib\/private\/route\/router.php(227): call_user_func('\\x00lambda_1506', Array)","level":4,"time":"2014-09-04T06:00:33+00:00","method":"GET","url":"\/master\/index.php\/apps\/files\/ajax\/scan.php?force=false&dir=&requesttoken=IvcDSomqR2KLX6smuSDpD.YVraGr2o"}
{"reqId":"54080001a86f8","app":"index","message":"Exception: #5 \/home\/mjob\/Projekte\/owncloud\/master\/lib\/base.php(725): OC\\Route\\Router->match('\/apps\/files\/aja...')","level":4,"time":"2014-09-04T06:00:33+00:00","method":"GET","url":"\/master\/index.php\/apps\/files\/ajax\/scan.php?force=false&dir=&requesttoken=IvcDSomqR2KLX6smuSDpD.YVraGr2o"}
{"reqId":"54080001a86f8","app":"index","message":"Exception: #6 \/home\/mjob\/Projekte\/owncloud\/master\/index.php(28): OC::handleRequest()","level":4,"time":"2014-09-04T06:00:33+00:00","method":"GET","url":"\/master\/index.php\/apps\/files\/ajax\/scan.php?force=false&dir=&requesttoken=IvcDSomqR2KLX6smuSDpD.YVraGr2o"}
{"reqId":"54080001a86f8","app":"index","message":"Exception: #7 {main}","level":4,"time":"2014-09-04T06:00:33+00:00","method":"GET","url":"\/master\/index.php\/apps\/files\/ajax\/scan.php?force=false&dir=&requesttoken=IvcDSomqR2KLX6smuSDpD.YVraGr2o"}
{"reqId":"54080001a86f8","app":"PHP","message":"Cannot modify header information - headers already sent by (output started at \/home\/mjob\/Projekte\/owncloud\/master\/lib\/private\/eventsource.php:81) at \/home\/mjob\/Projekte\/owncloud\/master\/lib\/private\/response.php#83","level":0,"time":"2014-09-04T06:00:33+00:00","method":"GET","url":"\/master\/index.php\/apps\/files\/ajax\/scan.php?force=false&dir=&requesttoken=IvcDSomqR2KLX6smuSDpD.YVraGr2o"}

MorrisJobke · 2014-09-04T06:01:43Z

This appears in my log once the filescan is triggered.

MorrisJobke · 2014-09-04T06:01:59Z

and reappears on every file scan

scrutinizer-notifier · 2014-09-04T11:28:19Z

A new inspection was created.

icewind1991 · 2014-09-04T11:28:40Z

@MorrisJobke should be fixed now

ghost · 2014-09-04T11:45:22Z

🚀 Test Passed. 🚀
Refer to this link for build results: https://ci.owncloud.org/job/pull-request-analyser/7088/

MorrisJobke · 2014-09-04T11:46:03Z


Testing with sqlite ...
PHP Fatal error:  Class 'OC_Mount_Config' not found in /var/lib/jenkins/jobs/pull-request-analyser/workspace/apps/files_external/tests/mountconfig.php on line 225
PHP Stack trace:
PHP   1. {main}() /usr/bin/phpunit:0
PHP   2. PHPUnit_TextUI_Command::main() /usr/bin/phpunit:46
PHP   3. PHPUnit_TextUI_Command->run() /usr/share/php/PHPUnit/TextUI/Command.php:129
PHP   4. PHPUnit_TextUI_Command->handleArguments() /usr/share/php/PHPUnit/TextUI/Command.php:138
PHP   5. PHPUnit_Util_Configuration->getTestSuiteConfiguration() /usr/share/php/PHPUnit/TextUI/Command.php:657
PHP   6. PHPUnit_Util_Configuration->getTestSuite() /usr/share/php/PHPUnit/Util/Configuration.php:789
PHP   7. PHPUnit_Framework_TestSuite->addTestFile() /usr/share/php/PHPUnit/Util/Configuration.php:912
PHP   8. PHPUnit_Framework_TestSuite->addTestSuite() /usr/share/php/PHPUnit/Framework/TestSuite.php:389
PHP   9. PHPUnit_Framework_TestSuite->__construct() /usr/share/php/PHPUnit/Framework/TestSuite.php:315
PHP  10. PHPUnit_Framework_TestSuite->addTestMethod() /usr/share/php/PHPUnit/Framework/TestSuite.php:212
PHP  11. PHPUnit_Framework_TestSuite::createTest() /usr/share/php/PHPUnit/Framework/TestSuite.php:834
PHP  12. PHPUnit_Util_Test::getProvidedData() /usr/share/php/PHPUnit/Framework/TestSuite.php:481
PHP  13. ReflectionMethod->invoke() /usr/share/php/PHPUnit/Util/Test.php:263
PHP  14. Test_Mount_Config->applicableConfigProvider() /usr/share/php/PHPUnit/Util/Test.php:263
+ ./autotest.sh mysql
Using database oc_autotest1
Setup environment for mysql testing ...
INDEX
END INDEX
Testing with mysql ...
PHP Fatal error:  Class 'OC_Mount_Config' not found in /var/lib/jenkins/jobs/pull-request-analyser/workspace/apps/files_external/tests/mountconfig.php on line 225
PHP Stack trace:
PHP   1. {main}() /usr/bin/phpunit:0
PHP   2. PHPUnit_TextUI_Command::main() /usr/bin/phpunit:46
PHP   3. PHPUnit_TextUI_Command->run() /usr/share/php/PHPUnit/TextUI/Command.php:129
PHP   4. PHPUnit_TextUI_Command->handleArguments() /usr/share/php/PHPUnit/TextUI/Command.php:138
PHP   5. PHPUnit_Util_Configuration->getTestSuiteConfiguration() /usr/share/php/PHPUnit/TextUI/Command.php:657
PHP   6. PHPUnit_Util_Configuration->getTestSuite() /usr/share/php/PHPUnit/Util/Configuration.php:789
PHP   7. PHPUnit_Framework_TestSuite->addTestFile() /usr/share/php/PHPUnit/Util/Configuration.php:912
PHP   8. PHPUnit_Framework_TestSuite->addTestSuite() /usr/share/php/PHPUnit/Framework/TestSuite.php:389
PHP   9. PHPUnit_Framework_TestSuite->__construct() /usr/share/php/PHPUnit/Framework/TestSuite.php:315
PHP  10. PHPUnit_Framework_TestSuite->addTestMethod() /usr/share/php/PHPUnit/Framework/TestSuite.php:212
PHP  11. PHPUnit_Framework_TestSuite::createTest() /usr/share/php/PHPUnit/Framework/TestSuite.php:834
PHP  12. PHPUnit_Util_Test::getProvidedData() /usr/share/php/PHPUnit/Framework/TestSuite.php:481
PHP  13. ReflectionMethod->invoke() /usr/share/php/PHPUnit/Util/Test.php:263
PHP  14. Test_Mount_Config->applicableConfigProvider() /usr/share/php/PHPUnit/Util/Test.php:263
+ ./autotest.sh pgsql
Using database oc_autotest1
Setup environment for pgsql testing ...
INDEX
END INDEX
Testing with pgsql ...
PHP Fatal error:  Class 'OC_Mount_Config' not found in /var/lib/jenkins/jobs/pull-request-analyser/workspace/apps/files_external/tests/mountconfig.php on line 225
PHP Stack trace:
PHP   1. {main}() /usr/bin/phpunit:0
PHP   2. PHPUnit_TextUI_Command::main() /usr/bin/phpunit:46
PHP   3. PHPUnit_TextUI_Command->run() /usr/share/php/PHPUnit/TextUI/Command.php:129
PHP   4. PHPUnit_TextUI_Command->handleArguments() /usr/share/php/PHPUnit/TextUI/Command.php:138
PHP   5. PHPUnit_Util_Configuration->getTestSuiteConfiguration() /usr/share/php/PHPUnit/TextUI/Command.php:657
PHP   6. PHPUnit_Util_Configuration->getTestSuite() /usr/share/php/PHPUnit/Util/Configuration.php:789
PHP   7. PHPUnit_Framework_TestSuite->addTestFile() /usr/share/php/PHPUnit/Util/Configuration.php:912
PHP   8. PHPUnit_Framework_TestSuite->addTestSuite() /usr/share/php/PHPUnit/Framework/TestSuite.php:389
PHP   9. PHPUnit_Framework_TestSuite->__construct() /usr/share/php/PHPUnit/Framework/TestSuite.php:315
PHP  10. PHPUnit_Framework_TestSuite->addTestMethod() /usr/share/php/PHPUnit/Framework/TestSuite.php:212
PHP  11. PHPUnit_Framework_TestSuite::createTest() /usr/share/php/PHPUnit/Framework/TestSuite.php:834
PHP  12. PHPUnit_Util_Test::getProvidedData() /usr/share/php/PHPUnit/Framework/TestSuite.php:481
PHP  13. ReflectionMethod->invoke() /usr/share/php/PHPUnit/Util/Test.php:263
PHP  14. Test_Mount_Config->applicableConfigProvider() /usr/share/php/PHPUnit/Util/Test.php:263

MorrisJobke · 2014-09-04T11:46:31Z

@owncloud-bot retest this please

ghost · 2014-09-04T12:00:32Z

🚀 Test Passed. 🚀
Refer to this link for build results: https://ci.owncloud.org/job/pull-request-analyser/7089/

LukasReschke · 2014-09-08T16:46:25Z

👍

Add EventSource to the public API

icewind1991 added 3 commits September 3, 2014 13:35

Initialize an event source when we start using it, not in the constru…

54c918f

…ctor

Add event source to the public api

dad5318

Use the public api to get event sources

65608d7

icewind1991 force-pushed the eventsource-public branch from f1c92c0 to 6482890 Compare September 3, 2014 11:37

PVince81 reviewed Sep 3, 2014
View reviewed changes

icewind1991 force-pushed the eventsource-public branch from 449fa21 to e45ee87 Compare September 3, 2014 23:11

icewind1991 added 2 commits September 4, 2014 13:26

Explicitly cast id and validate type

8605e2e

Better phpdoc and method naming

fa33936

icewind1991 force-pushed the eventsource-public branch from e45ee87 to fa33936 Compare September 4, 2014 11:28

LukasReschke added a commit that referenced this pull request Sep 8, 2014

Merge pull request #10739 from owncloud/eventsource-public

70abce0

Add EventSource to the public API

LukasReschke merged commit 70abce0 into master Sep 8, 2014

LukasReschke deleted the eventsource-public branch September 8, 2014 16:46

LukasReschke mentioned this pull request Dec 11, 2014

OCP.EventSource (JS) is missing for apps builders #12800

Closed

2 tasks

lock bot locked as resolved and limited conversation to collaborators Aug 16, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add EventSource to the public API #10739

Add EventSource to the public API #10739

icewind1991 commented Aug 29, 2014

ghost commented Aug 29, 2014

MorrisJobke commented Aug 30, 2014

DeepDiver1975 commented Aug 31, 2014

DeepDiver1975 commented Sep 3, 2014

MorrisJobke commented Sep 3, 2014

ghost commented Sep 3, 2014

icewind1991 commented Sep 3, 2014

PVince81 Sep 3, 2014

PVince81 Sep 3, 2014

icewind1991 commented Sep 3, 2014

ghost commented Sep 3, 2014

MorrisJobke commented Sep 4, 2014

MorrisJobke commented Sep 4, 2014

MorrisJobke commented Sep 4, 2014

scrutinizer-notifier commented Sep 4, 2014

icewind1991 commented Sep 4, 2014

ghost commented Sep 4, 2014

MorrisJobke commented Sep 4, 2014

MorrisJobke commented Sep 4, 2014

ghost commented Sep 4, 2014

LukasReschke commented Sep 8, 2014

Add EventSource to the public API #10739

Add EventSource to the public API #10739

Conversation

icewind1991 commented Aug 29, 2014

ghost commented Aug 29, 2014

MorrisJobke commented Aug 30, 2014

DeepDiver1975 commented Aug 31, 2014

DeepDiver1975 commented Sep 3, 2014

MorrisJobke commented Sep 3, 2014

ghost commented Sep 3, 2014

icewind1991 commented Sep 3, 2014

PVince81 Sep 3, 2014

Choose a reason for hiding this comment

PVince81 Sep 3, 2014

Choose a reason for hiding this comment

icewind1991 commented Sep 3, 2014

ghost commented Sep 3, 2014

MorrisJobke commented Sep 4, 2014

MorrisJobke commented Sep 4, 2014

MorrisJobke commented Sep 4, 2014

scrutinizer-notifier commented Sep 4, 2014

icewind1991 commented Sep 4, 2014

ghost commented Sep 4, 2014

MorrisJobke commented Sep 4, 2014

MorrisJobke commented Sep 4, 2014

ghost commented Sep 4, 2014

LukasReschke commented Sep 8, 2014