diff options
| author | Erik Johnston <erik@matrix.org> | 2015-04-07 18:05:39 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-04-07 18:05:39 +0100 |
| commit | 4fe95094d1aa9a8a36a32c56d5665ddba825e029 (patch) | |
| tree | d7e88a7b2ce0d41403c7a7afaff3b44088e60324 /synapse/handlers/__init__.py | |
| parent | Retry on deadlock (diff) | |
| parent | update leo's contribs a bit (diff) | |
| download | synapse-4fe95094d1aa9a8a36a32c56d5665ddba825e029.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into mysql
Diffstat (limited to 'synapse/handlers/__init__.py')
| -rw-r--r-- | synapse/handlers/__init__.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/synapse/handlers/__init__.py b/synapse/handlers/__init__.py index 8d345bf936..0c51d615ec 100644 --- a/synapse/handlers/__init__.py +++ b/synapse/handlers/__init__.py @@ -13,6 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +from synapse.appservice.scheduler import AppServiceScheduler from synapse.appservice.api import ApplicationServiceApi from .register import RegistrationHandler from .room import ( @@ -54,7 +55,12 @@ class Handlers(object): self.directory_handler = DirectoryHandler(hs) self.typing_notification_handler = TypingNotificationHandler(hs) self.admin_handler = AdminHandler(hs) + asapi = ApplicationServiceApi(hs) self.appservice_handler = ApplicationServicesHandler( - hs, ApplicationServiceApi(hs) + hs, asapi, AppServiceScheduler( + clock=hs.get_clock(), + store=hs.get_datastore(), + as_api=asapi + ) ) self.sync_handler = SyncHandler(hs) |