GitLab

On the basis of my profiling and testing over the last week,
all of the scripts affected by this patch don't need their
raise_memory_limit calls. Ensure_sanity currently sets the
memory limit to 128MB, which has been seen to be more than
sufficient for each of these use cases.

Tests have involved at least 1000 records being imported in
each case, and sometimes as many as 20,000. I would have
liked to have tested with some really full profiles (eg
lots of pictures and content), but am satisfied that there's
enough margin to cover those cases. In any case, such files
are often handled using external apps and therefore won't
be counted toward PHP's memory use anyway. Finally, the
limit can easily be increased by the user if necessary for
a particular case.

Change-Id: Ifecc83fd47da51268bae6cbd6960735eb91f9403
Signed-off-by: Nigel Cunningham <nigelc@catalyst-au.net>

As vetted in the May 2014 dev meeting
http://meetbot.mahara.org/mahara-dev/2014/mahara-dev.2014-05-01-08.01.log.html

Change-Id: I353ed74d69a5346fbe4e8e521e5c349dbe8dcbac

- have updated copyright for the pages that had existing copyright
notices (except for the lib/pieforms/ section as i'm not too sure if
that needs changing as it is a different Catalyst IT product)

Change-Id: I11c65ad26cb9cd856cf16b1dccbd4223ba086645
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
Signed-off-by: Aaron Wells <aaronw@catalyst.net.nz>

If a cron function causes an exception for whatever reason, then the
cron will stop, but the lock isn't removed. The job then isn't tried
again for another 24 hours.

Instead we should try to set the next run time and remove the lock.
Cron functions that run frequently, but fail due to some temporary
problem, will not be forced to stop for 24 hours.  On the other hand,
very frequent cron functions that throw exceptions on every run will
be spammy.

Obviously, this change has no effect on cron functions that fail due
to script timeouts, out-of-memory errors, or which exit for any other
reason.

Change-Id: I3bfe08c2ebba62cbd82045e66438a6442d1f1fe8
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

The status messages in cron.php are logged at the debug level, which
makes it difficult to separate them from some of the more trivial
messages that we may want to output - for example, when deleting old
cached files from disk.  It's more helpful to log the status messages
at the info level instead, so that people can add log_debug calls more
freely.

Change-Id: Ibdca949d770b84ff910f7aa6a8446c001ed5bbc6
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

When cron finds a function with a stale (day-old) lock, just remove
the lock and give up rather than trying to execute the function again.
It's already pretty late, and waiting another minute for the next cron
to start won't make a difference.

This should avoid the case where two copies of cron both find the stale
lock at the same time, and restart simultaneously.  It won't matter if
cron_lock fails to get a $started value because the row has been
deleted: the next instance of cron to run will be able to insert the
row.

Change-Id: I025aaf89d64f47466f1ba4c5bb8178317277ec2c
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

Bug #547803

Change-Id: I625e90b780505ebf3a42d4ab2419321d444c1cbd
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>

These closing tags are unnecessary and against our coding
guidelines. Let's get rid of them all in one go.

Change-Id: Ia94f103e525185597ee3780a3839d7577cdd0c29
Signed-off-by: Francois Marier <francois@catalyst.net.nz>

I inadvertantly pushed the first half of this commit last night. This is
the second half of the patch which ensures that we really don't get two
crons running simultaneously.
Signed-off-by: Andrew Robert Nicols <andrew.nicols@luns.net.uk>

Signed-off-by: Andrew Robert Nicols <andrew.nicols@luns.net.uk>

Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

Will also show finishing time relative to fake cron time, if the feature is used.

Bug #646397

This is essential for server configurations that do not (or cannot) run
the cron.php every minute.  This change:

+ makes the maxrunage configurable
+ makes the configuration a default of 300 (same as current code setting)
(cherry picked from commit aa5618fb4d7bb22a77b813a735f1ae40f096a33a)

Conflicts:

	htdocs/config-defaults.php
	htdocs/lib/cron.php

(cherry picked from commit a42825eb8b44a0299ded915136a6c928fff21437)

Add function raise_memory_limit from Moodle, and use it to raise Mahara's default working memory to 32M.

This comes after a few complaints that certain RSS feeds would cause the View editor to die. Noticed by Derrin, mjmontagne and myself (on biobrio).

still to do:

- cron processing is completely untested
- i would like to split out the import table based on the transport:
  import_queue.host and token should go into a import_queue_mnet table
- it's possibly worth thinking about making import a proper plugin type.
  not sure about the effect this has on the import transport
  framework...  it might be possible to have both import and
  import transport plugintypes but that might be too heavy
- at the very least if we split out import_queue.host and token into an
  mnet table it will pave the way for a better refactor laterz.
- i would still really like to improve the mnet namespacing but that
  might be plausible at this point.
- need to write docs about arguments and return types
- i want to change the content_ready arguments to not include
  $filesmanifest as that is dependent on format being file - it may
  be actually better to dispatch somewhere else based on $format and
  then just have a generic $data which would be $filesmanifest for files
  and then something else for something like LEAP or maharanative or
  whatever, as this is checked in the importer, not not the
  importertransport.

I suspect there are bad queries in there hoggin' all the interRAMs, but no time to look now through all the cronjobs!

The name is largely irrelevant as it's only the creator of the file.

Signed-off-by: Andrew McMillan

Changed all requires.
Also removed not used json/renderartefact.php

some requires for additional libs

resulting stuff to objects rather than arrays